From 3d0ba64a590a8d542685fc94e4470c7fb95e9b5c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 24 Feb 2014 17:10:20 +0000
Subject: [PATCH 1/4] driftFluxFoam: Rationalise phase-fraction handling and
 implement semi-implicit MULES

---
 .../solvers/multiphase/driftFluxFoam/UEqn.H   |   2 +-
 .../multiphase/driftFluxFoam/alphaControls.H  |   4 -
 .../multiphase/driftFluxFoam/alphaEqn.H       | 102 ++++++++++++++++--
 .../driftFluxFoam/alphaEqnSubCycle.H          |  32 +++---
 .../multiphase/driftFluxFoam/calcVdj.H        |   6 +-
 .../driftFluxFoam/correctViscosity.H          |   4 +-
 .../multiphase/driftFluxFoam/createFields.H   |  20 ++--
 .../multiphase/driftFluxFoam/driftFluxFoam.C  |   2 +
 .../multiphase/driftFluxFoam/wallViscosity.H  |   2 +-
 .../multiphase/driftFluxFoam/yieldStress.H    |   4 +-
 .../ras/dahl/0/{alpha => alpha1}              |   2 +-
 .../ras/dahl/constant/transportProperties     |   5 +-
 .../driftFluxFoam/ras/dahl/system/controlDict |   2 +-
 .../driftFluxFoam/ras/dahl/system/fvSchemes   |   4 +-
 .../driftFluxFoam/ras/dahl/system/fvSolution  |  32 ++++--
 .../ras/mixerVessel2D/0/{alpha => alpha1}     |   2 +-
 .../constant/transportProperties              |   5 +-
 .../ras/mixerVessel2D/system/controlDict      |   3 +-
 .../ras/mixerVessel2D/system/fvSchemes        |   6 +-
 .../ras/mixerVessel2D/system/fvSolution       |  22 +++-
 .../multiphase/driftFluxFoam/ras/tank3D/0/U   |   4 +-
 .../ras/tank3D/0/{alpha => alpha1}            |   2 +-
 .../ras/tank3D/constant/transportProperties   |   5 +-
 .../ras/tank3D/system/controlDict             |   6 +-
 .../driftFluxFoam/ras/tank3D/system/fvSchemes |   4 +-
 .../ras/tank3D/system/fvSolution              |  25 +++--
 26 files changed, 215 insertions(+), 92 deletions(-)
 delete mode 100644 applications/solvers/multiphase/driftFluxFoam/alphaControls.H
 rename tutorials/multiphase/driftFluxFoam/ras/dahl/0/{alpha => alpha1} (98%)
 rename tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/{alpha => alpha1} (97%)
 rename tutorials/multiphase/driftFluxFoam/ras/tank3D/0/{alpha => alpha1} (98%)

diff --git a/applications/solvers/multiphase/driftFluxFoam/UEqn.H b/applications/solvers/multiphase/driftFluxFoam/UEqn.H
index b6d87564..010417a0 100644
--- a/applications/solvers/multiphase/driftFluxFoam/UEqn.H
+++ b/applications/solvers/multiphase/driftFluxFoam/UEqn.H
@@ -6,7 +6,7 @@
       + fvm::div(rhoPhi, U)
       + fvc::div
         (
-            (alpha/(scalar(1.001) - alpha))*((rhoc*rhod)/rho)*Vdj*Vdj,
+            (alpha1/(scalar(1.001) - alpha1))*((rho2*rho1)/rho)*Vdj*Vdj,
             "div(phiVdj,Vdj)"
         )
       - fvm::laplacian(muEff, U)
diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaControls.H b/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
deleted file mode 100644
index 5a3d10bd..00000000
--- a/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
+++ /dev/null
@@ -1,4 +0,0 @@
-const dictionary& alphaControls = mesh.solverDict(alpha.name());
-
-label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
index 89c139df..817a0c91 100644
--- a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
@@ -2,30 +2,118 @@
     word alphaScheme("div(phi,alpha)");
     word alpharScheme("div(phirb,alpha)");
 
+    if (MULESCorr)
+    {
+        fvScalarMatrix alpha1Eqn
+        (
+            #ifdef LTSSOLVE
+            fv::localEulerDdtScheme<scalar>(mesh, rDeltaT.name()).fvmDdt(alpha1)
+            #else
+            fv::EulerDdtScheme<scalar>(mesh).fvmDdt(alpha1)
+            #endif
+          + fv::gaussConvectionScheme<scalar>
+            (
+                mesh,
+                phi,
+                upwind<scalar>(mesh, phi)
+            ).fvmDiv(phi, alpha1)
+          - fv::gaussLaplacianScheme<scalar, scalar>
+            (
+                mesh,
+                linear<scalar>(mesh),
+                fv::uncorrectedSnGrad<scalar>(mesh)
+            ).fvmLaplacian(fvc::interpolate(mut/rho), alpha1)
+        );
+
+        alpha1Eqn.solve();
+
+        Info<< "Phase-1 volume fraction = "
+            << alpha1.weightedAverage(mesh.Vsc()).value()
+            << "  Min(alpha1) = " << min(alpha1).value()
+            << "  Max(alpha1) = " << max(alpha1).value()
+            << endl;
+
+        tmp<surfaceScalarField> tphiAlphaUD(alpha1Eqn.flux());
+        phiAlpha = tphiAlphaUD();
+
+        if (alphaApplyPrevCorr && tphiAlphaCorr0.valid())
+        {
+            Info<< "Applying the previous iteration correction flux" << endl;
+            #ifdef LTSSOLVE
+            MULES::LTScorrect(alpha1, phiAlpha, tphiAlphaCorr0(), 1, 0);
+            #else
+            MULES::correct(alpha1, phiAlpha, tphiAlphaCorr0(), 1, 0);
+            #endif
+
+            phiAlpha += tphiAlphaCorr0();
+        }
+
+        // Cache the upwind-flux
+        tphiAlphaCorr0 = tphiAlphaUD;
+    }
+
     for (int aCorr=0; aCorr<nAlphaCorr; aCorr++)
     {
-        phiAlpha =
+        tmp<surfaceScalarField> tphiAlphaUn
         (
             fvc::flux
             (
                 phi,
-                alpha,
+                alpha1,
                 alphaScheme
             )
           + fvc::flux
             (
                 phir,
-                alpha,
+                alpha1,
                 alpharScheme
             )
         );
 
-        MULES::explicitSolve(alpha, phi, phiAlpha, 1, 0);
+        if (MULESCorr)
+        {
+            tmp<surfaceScalarField> tphiAlphaCorr(tphiAlphaUn() - phiAlpha);
+            volScalarField alpha10(alpha1);
+
+            #ifdef LTSSOLVE
+            MULES::LTScorrect(alpha1, tphiAlphaUn(), tphiAlphaCorr(), 1, 0);
+            #else
+            MULES::correct(alpha1, tphiAlphaUn(), tphiAlphaCorr(), 1, 0);
+            #endif
+
+            // Under-relax the correction for all but the 1st corrector
+            if (aCorr == 0)
+            {
+                phiAlpha += tphiAlphaCorr();
+            }
+            else
+            {
+                alpha1 = 0.5*alpha1 + 0.5*alpha10;
+                phiAlpha += 0.5*tphiAlphaCorr();
+            }
+        }
+        else
+        {
+            phiAlpha = tphiAlphaUn;
+
+            #ifdef LTSSOLVE
+            MULES::explicitLTSSolve(alpha1, phi, phiAlpha, 1, 0);
+            #else
+            MULES::explicitSolve(alpha1, phi, phiAlpha, 1, 0);
+            #endif
+        }
     }
 
+    if (alphaApplyPrevCorr && MULESCorr)
+    {
+        tphiAlphaCorr0 = phiAlpha - tphiAlphaCorr0;
+    }
+
+    alpha2 = 1.0 - alpha1;
+
     Info<< "Phase-1 volume fraction = "
-        << alpha.weightedAverage(mesh.Vsc()).value()
-        << "  Min(alpha) = " << min(alpha).value()
-        << "  Max(alpha) = " << max(alpha).value()
+        << alpha1.weightedAverage(mesh.Vsc()).value()
+        << "  Min(alpha1) = " << min(alpha1).value()
+        << "  Max(alpha1) = " << max(alpha1).value()
         << endl;
 }
diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
index d0c08ba9..f134702c 100644
--- a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
@@ -13,7 +13,7 @@
 
     surfaceScalarField phir
     (
-        rhoc*(mesh.Sf() & fvc::interpolate(Vdj/rho))
+        rho2*(mesh.Sf() & fvc::interpolate(Vdj/rho))
     );
 
     if (nAlphaSubCycles > 1)
@@ -33,7 +33,7 @@
 
         for
         (
-            subCycle<volScalarField> alphaSubCycle(alpha, nAlphaSubCycles);
+            subCycle<volScalarField> alphaSubCycle(alpha1, nAlphaSubCycles);
             !(++alphaSubCycle).end();
         )
         {
@@ -50,24 +50,26 @@
 
     // Apply the diffusion term separately to allow implicit solution
     // and boundedness of the explicit advection
+    if (!MULESCorr)
     {
-        fvScalarMatrix alphaEqn
+        fvScalarMatrix alpha1Eqn
         (
-            fvm::ddt(alpha) - fvc::ddt(alpha)
-          - fvm::laplacian(mut/rho, alpha)
+            fvm::ddt(alpha1) - fvc::ddt(alpha1)
+          - fvm::laplacian(mut/rho, alpha1)
         );
 
-        alphaEqn.solve();
+        alpha1Eqn.solve(mesh.solver("alpha1Diffusion"));
 
-        phiAlpha += alphaEqn.flux();
+        phiAlpha += alpha1Eqn.flux();
+        alpha2 = 1.0 - alpha1;
+
+        Info<< "Phase-1 volume fraction = "
+            << alpha1.weightedAverage(mesh.Vsc()).value()
+            << "  Min(alpha1) = " << min(alpha1).value()
+            << "  Max(alpha1) = " << max(alpha1).value()
+            << endl;
     }
 
-    Info<< "Phase-1 volume fraction = "
-        << alpha.weightedAverage(mesh.Vsc()).value()
-        << "  Min(alpha) = " << min(alpha).value()
-        << "  Max(alpha) = " << max(alpha).value()
-        << endl;
-
-    rhoPhi = phiAlpha*(rhod - rhoc) + phi*rhoc;
-    rho == alpha*rhod + (scalar(1) - alpha)*rhoc;
+    rhoPhi = phiAlpha*(rho1 - rho2) + phi*rho2;
+    rho == alpha1*rho1 + alpha2*rho2;
 }
diff --git a/applications/solvers/multiphase/driftFluxFoam/calcVdj.H b/applications/solvers/multiphase/driftFluxFoam/calcVdj.H
index 7a921ef7..cf02fafd 100644
--- a/applications/solvers/multiphase/driftFluxFoam/calcVdj.H
+++ b/applications/solvers/multiphase/driftFluxFoam/calcVdj.H
@@ -2,13 +2,13 @@ if (VdjModel == "general")
 {
     Vdj = V0*
     (
-        exp(-a*max(alpha - alphaMin, scalar(0)))
-      - exp(-a1*max(alpha - alphaMin, scalar(0)))
+        exp(-a*max(alpha1 - alphaMin, scalar(0)))
+      - exp(-a1*max(alpha1 - alphaMin, scalar(0)))
     );
 }
 else if (VdjModel == "simple")
 {
-    Vdj = V0*pow(10.0, -a*max(alpha, scalar(0)));
+    Vdj = V0*pow(10.0, -a*max(alpha1, scalar(0)));
 }
 else
 {
diff --git a/applications/solvers/multiphase/driftFluxFoam/correctViscosity.H b/applications/solvers/multiphase/driftFluxFoam/correctViscosity.H
index 0bf086a4..38c6f804 100644
--- a/applications/solvers/multiphase/driftFluxFoam/correctViscosity.H
+++ b/applications/solvers/multiphase/driftFluxFoam/correctViscosity.H
@@ -4,7 +4,7 @@
         (
             plasticViscosityCoeff,
             plasticViscosityExponent,
-            alpha
+            alpha1
         );
 
     if (BinghamPlastic)
@@ -14,7 +14,7 @@
             yieldStressCoeff,
             yieldStressExponent,
             yieldStressOffset,
-            alpha
+            alpha1
         );
 
         mul =
diff --git a/applications/solvers/multiphase/driftFluxFoam/createFields.H b/applications/solvers/multiphase/driftFluxFoam/createFields.H
index 950235cf..01917ba2 100644
--- a/applications/solvers/multiphase/driftFluxFoam/createFields.H
+++ b/applications/solvers/multiphase/driftFluxFoam/createFields.H
@@ -12,12 +12,12 @@
         mesh
     );
 
-    Info<< "Reading field alpha\n" << endl;
-    volScalarField alpha
+    Info<< "Reading field alpha1\n" << endl;
+    volScalarField alpha1
     (
         IOobject
         (
-            "alpha",
+            "alpha1",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -26,6 +26,8 @@
         mesh
     );
 
+    volScalarField alpha2("alpha2", scalar(1) - alpha1);
+
     Info<< "Reading field U\n" << endl;
     volVectorField U
     (
@@ -58,9 +60,8 @@
     );
 
 
-    dimensionedScalar rhoc(transportProperties.lookup("rhoc"));
-
-    dimensionedScalar rhod(transportProperties.lookup("rhod"));
+    dimensionedScalar rho1(transportProperties.lookup("rho1"));
+    dimensionedScalar rho2(transportProperties.lookup("rho2"));
 
     dimensionedScalar muc(transportProperties.lookup("muc"));
     dimensionedScalar muMax(transportProperties.lookup("muMax"));
@@ -102,7 +103,7 @@
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        alpha*rhod + (scalar(1) - alpha)*rhoc
+        alpha1*rho1 + alpha2*rho2
     );
     rho.oldTime();
 
@@ -136,7 +137,7 @@
         (
             plasticViscosityCoeff,
             plasticViscosityExponent,
-            alpha
+            alpha1
         )
     );
 
@@ -382,3 +383,6 @@
         );
         p_rgh = p - rho*gh;
     }
+
+
+    tmp<surfaceScalarField> tphiAlphaCorr0;
diff --git a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
index d0aafc6e..00e80087 100644
--- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
+++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
@@ -45,6 +45,8 @@ Description
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
+#include "gaussLaplacianScheme.H"
+#include "uncorrectedSnGrad.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiphase/driftFluxFoam/wallViscosity.H b/applications/solvers/multiphase/driftFluxFoam/wallViscosity.H
index d63f7e79..ac87a026 100644
--- a/applications/solvers/multiphase/driftFluxFoam/wallViscosity.H
+++ b/applications/solvers/multiphase/driftFluxFoam/wallViscosity.H
@@ -3,7 +3,7 @@
     const scalar kappa_ = kappa.value();
     const scalar E_ = E.value();
     const scalar muc_ = muc.value();
-    const scalar nuc_ = muc_/rhoc.value();
+    const scalar nuc_ = muc_/rho2.value();
 
     const fvPatchList& patches = mesh.boundary();
 
diff --git a/applications/solvers/multiphase/driftFluxFoam/yieldStress.H b/applications/solvers/multiphase/driftFluxFoam/yieldStress.H
index eda55d2e..8d3fd8ee 100644
--- a/applications/solvers/multiphase/driftFluxFoam/yieldStress.H
+++ b/applications/solvers/multiphase/driftFluxFoam/yieldStress.H
@@ -3,7 +3,7 @@ volScalarField yieldStress
     const dimensionedScalar& yieldStressCoeff,
     const dimensionedScalar& yieldStressExponent,
     const dimensionedScalar& yieldStressOffset,
-    const volScalarField& alpha
+    const volScalarField& alpha1
 )
 {
     tmp<volScalarField> tfld
@@ -13,7 +13,7 @@ volScalarField yieldStress
             pow
             (
                 10.0,
-                yieldStressExponent*(max(alpha, scalar(0)) + yieldStressOffset)
+                yieldStressExponent*(max(alpha1, scalar(0)) + yieldStressOffset)
             )
           - pow
             (
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha1
similarity index 98%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha
rename to tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha1
index 807802b1..650cc6d1 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties
index ee877fce..e2079db0 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties
@@ -31,9 +31,8 @@ yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0;
 
 muMax           muMax [ 1 -1 -1 0 0 0 0 ] 10.0;
 
-rhoc            rhoc [ 1 -3 0 0 0 0 0 ] 996;
-
-rhod            rhod [ 1 -3 0 0 0 0 0 ] 1996;
+rho1            rho1 [ 1 -3 0 0 0 0 0 ] 1996;
+rho2            rho2 [ 1 -3 0 0 0 0 0 ] 996;
 
 VdjModel        simple;
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict
index 04cdc807..67e02247 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict
@@ -47,7 +47,7 @@ runTimeModifiable yes;
 
 adjustTimeStep  on;
 
-maxCo           1;
+maxCo           5;
 
 maxDeltaT       1;
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
index 9f169f3c..98e6fa16 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(rhoPhi,U)       Gauss linearUpwind grad(U);
     div(phiVdj,Vdj)     Gauss linear;
     div(phi,alpha)      Gauss vanLeer;
-    div(phirb,alpha)    Gauss vanLeer;
+    div(phirb,alpha)    Gauss linear;
     div(rhoPhi,k)       Gauss limitedLinear 1;
     div(rhoPhi,epsilon) Gauss limitedLinear 1;
 
@@ -58,7 +58,7 @@ fluxRequired
 {
     default         no;
     p_rgh;
-    alpha;
+    alpha1;
 }
 
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
index c9120401..b78a4821 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
@@ -17,10 +17,14 @@ FoamFile
 
 solvers
 {
-    "alpha.*"
+    "alpha1.*"
     {
-        nAlphaCorr      1;
-        nAlphaSubCycles 4;
+        nAlphaCorr      2;
+        nAlphaSubCycles 1;
+
+        MULESCorr       yes;
+        nLimiterIter    3;
+        alphaApplyPrevCorr  yes;
 
         solver          smoothSolver;
         smoother        symGaussSeidel;
@@ -29,6 +33,15 @@ solvers
         minIter         1;
     }
 
+    alpha1Diffusion
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0;
+        minIter         1;
+    }
+
     p_rgh
     {
         solver          GAMG;
@@ -49,7 +62,8 @@ solvers
 
     "(U|k|epsilon)"
     {
-        solver          smoothSolver;
+        solver          PBiCG;
+        preconditioner  DILU;
         smoother        symGaussSeidel;
         tolerance       1e-7;
         relTol          0.1;
@@ -65,20 +79,16 @@ solvers
 
 PIMPLE
 {
-    nCorrectors     2;
+    momentumPredictor no;
+    nCorrectors     3;
     nNonOrthogonalCorrectors 0;
 }
 
 relaxationFactors
 {
-    fields
-    {
-    }
     equations
     {
-        "U.*"           1;
-        "k.*"           1;
-        "epsilon.*"     1;
+        ".*"           1;
     }
 }
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha1
similarity index 97%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha
rename to tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha1
index eb8492e6..22f0efce 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties
index ee877fce..e2079db0 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties
@@ -31,9 +31,8 @@ yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0;
 
 muMax           muMax [ 1 -1 -1 0 0 0 0 ] 10.0;
 
-rhoc            rhoc [ 1 -3 0 0 0 0 0 ] 996;
-
-rhod            rhod [ 1 -3 0 0 0 0 0 ] 1996;
+rho1            rho1 [ 1 -3 0 0 0 0 0 ] 1996;
+rho2            rho2 [ 1 -3 0 0 0 0 0 ] 996;
 
 VdjModel        simple;
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict
index 25ba33a4..5f9bee13 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict
@@ -47,8 +47,7 @@ runTimeModifiable yes;
 
 adjustTimeStep  yes;
 
-maxCo           0.5;
-maxAlphaCo      0.5;
+maxCo           1;
 
 maxDeltaT       0.05;
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
index 4fb64f81..98e6fa16 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(rhoPhi,U)       Gauss linearUpwind grad(U);
     div(phiVdj,Vdj)     Gauss linear;
     div(phi,alpha)      Gauss vanLeer;
-    div(phirb,alpha)    Gauss vanLeer;
+    div(phirb,alpha)    Gauss linear;
     div(rhoPhi,k)       Gauss limitedLinear 1;
     div(rhoPhi,epsilon) Gauss limitedLinear 1;
 
@@ -57,8 +57,8 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    p_rgh           ;
-    alpha           ;
+    p_rgh;
+    alpha1;
 }
 
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
index 3f5cff1e..3fa09bb4 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
@@ -17,15 +17,29 @@ FoamFile
 
 solvers
 {
-    "alpha.*"
+    "alpha1.*"
     {
-        nAlphaCorr      1;
-        nAlphaSubCycles 3;
+        nAlphaCorr      2;
+        nAlphaSubCycles 1;
+
+        MULESCorr       yes;
+        nLimiterIter    3;
+        alphaApplyPrevCorr  yes;
 
         solver          smoothSolver;
         smoother        symGaussSeidel;
         tolerance       1e-6;
         relTol          0;
+        minIter         1;
+    }
+
+    alpha1Diffusion
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0;
+        minIter         1;
     }
 
     "rho.*"
@@ -71,7 +85,7 @@ solvers
 
 PIMPLE
 {
-    momentumPredictor yes;
+    momentumPredictor no;
     nCorrectors     3;
     nNonOrthogonalCorrectors 0;
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
index 1c824278..da99a43d 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
@@ -136,8 +136,8 @@ boundaryField
 
     OUTL15
     {
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
     }
 }
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha1
similarity index 98%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha
rename to tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha1
index 67aa1fa6..1a3bd64e 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties
index ac45d4a3..8c92706e 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties
@@ -31,9 +31,8 @@ yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0;
 
 muMax           muMax [ 1 -1 -1 0 0 0 0 ] 10.0;
 
-rhoc            rhoc [ 1 -3 0 0 0 0 0 ] 1000;
-
-rhod            rhod [ 1 -3 0 0 0 0 0 ] 1042;
+rho1            rho1 [ 1 -3 0 0 0 0 0 ] 1042;
+rho2            rho2 [ 1 -3 0 0 0 0 0 ] 1000;
 
 VdjModel        simple;
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
index 93e66698..dd41af85 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
@@ -25,7 +25,7 @@ stopAt          endTime;
 
 endTime         8000;
 
-deltaT          0.1;
+deltaT          0.5;
 
 writeControl    runTime;
 
@@ -33,11 +33,11 @@ writeInterval   50;
 
 purgeWrite      0;
 
-writeFormat     ascii;
+writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression uncompressed;
 
 timeFormat      general;
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
index 0d47c381..8809a091 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(rhoPhi,U)       Gauss linearUpwind grad(U);
     div(phiVdj,Vdj)     Gauss linear;
     div(phi,alpha)      Gauss vanLeer;
-    div(phirb,alpha)    Gauss vanLeer;
+    div(phirb,alpha)    Gauss linear;
     div(rhoPhi,k)       Gauss limitedLinear 1;
     div(rhoPhi,epsilon) Gauss limitedLinear 1;
 
@@ -58,7 +58,7 @@ fluxRequired
 {
     default         no;
     p_rgh;
-    alpha;
+    alpha1;
 }
 
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
index 403f82dc..f6f1b18e 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
@@ -17,10 +17,14 @@ FoamFile
 
 solvers
 {
-    "alpha.*"
+    "alpha1.*"
     {
-        nAlphaCorr      1;
-        nAlphaSubCycles 4;
+        nAlphaCorr      2;
+        nAlphaSubCycles 1;
+
+        MULESCorr       yes;
+        nLimiterIter    3;
+        alphaApplyPrevCorr  yes;
 
         solver          smoothSolver;
         smoother        symGaussSeidel;
@@ -29,6 +33,15 @@ solvers
         minIter         1;
     }
 
+    alpha1Diffusion
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-6;
+        relTol          0;
+        minIter         1;
+    }
+
     p_rgh
     {
         solver          GAMG;
@@ -65,15 +78,13 @@ solvers
 
 PIMPLE
 {
-    nCorrectors     2;
+    momentumPredictor no;
+    nCorrectors     3;
     nNonOrthogonalCorrectors 0;
 }
 
 relaxationFactors
 {
-    fields
-    {
-    }
     equations
     {
         ".*"       1;

From b766ecd3f957d8d31643963a28a06bec7100081d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 25 Feb 2014 09:53:16 +0000
Subject: [PATCH 2/4] buoyantPimpleFoam: Corrected phiHbyA Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1183

---
 applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
index 5f6d70e0..eb97fe49 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@@ -17,7 +17,7 @@
     (
         "phiHbyA",
         (
-            (fvc::interpolate(rho*U) & mesh.Sf())
+            (fvc::interpolate(rho*HbyA) & mesh.Sf())
           + rAUf*fvc::ddtCorr(rho, U, phi)
         )
       + phig

From 8038d7bc1d2ff14349fa153936fca3ea2a001204 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 26 Feb 2014 10:02:00 +0000
Subject: [PATCH 3/4] wedgeFvPatch: provide specialized version of delta() to
 ensure than the delta vectors are normal to the wedge plane. Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=1185

---
 .../fvMesh/fvPatches/constraint/wedge/wedgeFvPatch.C | 12 ++++++++++--
 .../fvMesh/fvPatches/constraint/wedge/wedgeFvPatch.H |  5 ++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/wedge/wedgeFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/wedge/wedgeFvPatch.C
index 94084ad9..ddc60991 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/wedge/wedgeFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/wedge/wedgeFvPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,6 @@ addToRunTimeSelectionTable(fvPatch, wedgeFvPatch, polyPatch);
 
 // * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * * * * //
 
-//- Construct from polyPatch
 wedgeFvPatch::wedgeFvPatch(const polyPatch& patch, const fvBoundaryMesh& bm)
 :
     fvPatch(patch, bm),
@@ -47,6 +46,15 @@ wedgeFvPatch::wedgeFvPatch(const polyPatch& patch, const fvBoundaryMesh& bm)
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::vectorField> Foam::wedgeFvPatch::delta() const
+{
+    const vectorField nHat(nf());
+    return nHat*(nHat & (Cf() - Cn()));
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/wedge/wedgeFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/wedge/wedgeFvPatch.H
index 81f6a5f3..16fab3e4 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/wedge/wedgeFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/wedge/wedgeFvPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,6 +83,9 @@ public:
             {
                 return wedgePolyPatch_.cellT();
             }
+
+            //- Return cell-centre to face normal vector
+            virtual tmp<vectorField> delta() const;
 };
 
 

From 3c01cb164ed25303902b1e7021167b5b72c0f713 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 26 Feb 2014 13:02:59 +0000
Subject: [PATCH 4/4] cavitatingFoam: rationalised phi -> rhoPhi, phiv -> phi
 for consistency with the other multiphase solvers. Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1192

---
 .../multiphase/cavitatingFoam/CourantNo.H     |  6 +++---
 .../solvers/multiphase/cavitatingFoam/UEqn.H  |  2 +-
 .../cavitatingDyMFoam/cavitatingDyMFoam.C     |  8 +++----
 .../cavitatingDyMFoam/correctPhi.H            |  8 +++----
 .../cavitatingFoam/cavitatingDyMFoam/pEqn.H   | 12 +++++------
 .../cavitatingFoam/cavitatingFoam.C           |  4 ++--
 .../multiphase/cavitatingFoam/createFields.H  | 21 +++++++++++++++----
 .../solvers/multiphase/cavitatingFoam/pEqn.H  | 10 ++++-----
 .../multiphase/cavitatingFoam/rhoEqn.H        |  4 ++--
 .../cavitatingFoam/les/throttle/0/U           |  2 +-
 .../les/throttle/0/alpha.vapour               |  2 +-
 .../cavitatingFoam/les/throttle/0/k           |  2 +-
 .../cavitatingFoam/les/throttle/0/nuSgs       |  2 +-
 .../cavitatingFoam/les/throttle/0/p           |  3 +--
 .../cavitatingFoam/les/throttle/0/rho         |  2 +-
 .../les/throttle/constant/LESProperties       |  2 +-
 .../throttle/constant/polyMesh/blockMeshDict  |  2 +-
 .../throttle/constant/thermodynamicProperties |  2 +-
 .../les/throttle/constant/transportProperties |  2 +-
 .../throttle/constant/turbulenceProperties    |  2 +-
 .../les/throttle/system/controlDict           |  2 +-
 .../les/throttle/system/fvSchemes             |  8 +++----
 .../les/throttle/system/fvSolution            | 10 ++++++++-
 .../les/throttle/system/refineMeshDict        |  2 +-
 .../les/throttle/system/topoSetDict.1         |  2 +-
 .../les/throttle/system/topoSetDict.2         |  2 +-
 .../les/throttle/system/topoSetDict.3         |  2 +-
 .../cavitatingFoam/les/throttle3D/0.org/U     |  2 +-
 .../les/throttle3D/0.org/alpha.vapour         |  2 +-
 .../cavitatingFoam/les/throttle3D/0.org/k     |  2 +-
 .../cavitatingFoam/les/throttle3D/0.org/nuSgs |  2 +-
 .../cavitatingFoam/les/throttle3D/0.org/p     |  3 +--
 .../cavitatingFoam/les/throttle3D/0.org/rho   |  2 +-
 .../les/throttle3D/constant/LESProperties     |  2 +-
 .../constant/polyMesh/blockMeshDict           |  2 +-
 .../constant/thermodynamicProperties          |  2 +-
 .../throttle3D/constant/transportProperties   |  2 +-
 .../throttle3D/constant/turbulenceProperties  |  2 +-
 .../les/throttle3D/system/controlDict         |  2 +-
 .../les/throttle3D/system/decomposeParDict    |  2 +-
 .../les/throttle3D/system/fvSchemes           |  8 +++----
 .../les/throttle3D/system/fvSolution          | 10 ++++++++-
 .../les/throttle3D/system/mapFieldsDict       |  2 +-
 .../les/throttle3D/system/refineMeshDict      |  2 +-
 .../les/throttle3D/system/topoSetDict.1       |  2 +-
 .../les/throttle3D/system/topoSetDict.2       |  2 +-
 .../les/throttle3D/system/topoSetDict.3       |  2 +-
 .../cavitatingFoam/ras/throttle/0/U           |  2 +-
 .../ras/throttle/0/alpha.vapour               |  2 +-
 .../cavitatingFoam/ras/throttle/0/k           |  2 +-
 .../cavitatingFoam/ras/throttle/0/nut         |  2 +-
 .../cavitatingFoam/ras/throttle/0/omega       |  2 +-
 .../cavitatingFoam/ras/throttle/0/p           |  3 +--
 .../cavitatingFoam/ras/throttle/0/rho         |  2 +-
 .../ras/throttle/constant/RASProperties       |  2 +-
 .../throttle/constant/polyMesh/blockMeshDict  |  2 +-
 .../throttle/constant/thermodynamicProperties |  2 +-
 .../ras/throttle/constant/transportProperties |  2 +-
 .../throttle/constant/turbulenceProperties    |  2 +-
 .../ras/throttle/system/controlDict           |  2 +-
 .../ras/throttle/system/fvSchemes             | 10 ++++-----
 .../ras/throttle/system/fvSolution            | 11 ++++++++--
 .../ras/throttle/system/refineMeshDict        |  2 +-
 .../ras/throttle/system/topoSetDict.1         |  2 +-
 .../ras/throttle/system/topoSetDict.2         |  2 +-
 .../ras/throttle/system/topoSetDict.3         |  2 +-
 66 files changed, 135 insertions(+), 102 deletions(-)

diff --git a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H
index 02a6c86d..a5bae745 100644
--- a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H
+++ b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ if (mesh.nInternalFaces())
 {
     scalarField sumPhi
     (
-        fvc::surfaceSum(mag(phiv))().internalField()
+        fvc::surfaceSum(mag(phi))().internalField()
     );
 
     CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue();
@@ -54,7 +54,7 @@ if (mesh.nInternalFaces())
     )*runTime.deltaTValue();
 }
 
-Info<< "phiv Courant Number mean: " << meanCoNum
+Info<< "phi Courant Number mean: " << meanCoNum
     << " max: " << CoNum
     << " acoustic max: " << acousticCoNum
     << endl;
diff --git a/applications/solvers/multiphase/cavitatingFoam/UEqn.H b/applications/solvers/multiphase/cavitatingFoam/UEqn.H
index 1ca0b9f0..8edf0d39 100644
--- a/applications/solvers/multiphase/cavitatingFoam/UEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/UEqn.H
@@ -1,7 +1,7 @@
     fvVectorMatrix UEqn
     (
         fvm::ddt(rho, U)
-      + fvm::div(phi, U)
+      + fvm::div(rhoPhi, U)
       + turbulence->divDevRhoReff(rho, U)
     );
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
index c3fde6b3..284ca97b 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
     #include "createFields.H"
     #include "createUf.H"
     #include "createPcorrTypes.H"
-    #include "compressibleCourantNo.H"
+    #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -86,12 +86,12 @@ int main(int argc, char *argv[])
             if (correctPhi)
             {
                 // Calculate absolute flux from the mapped surface velocity
-                phiv = mesh.Sf() & Uf;
+                phi = mesh.Sf() & Uf;
 
                 #include "correctPhi.H"
 
                 // Make the flux relative to the mesh motion
-                fvc::makeRelative(phiv, U);
+                fvc::makeRelative(phi, U);
             }
         }
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/correctPhi.H b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/correctPhi.H
index c05d6648..4bb1ce9d 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/correctPhi.H
@@ -14,7 +14,7 @@ if (mesh.changing())
         {
             U.boundaryField()[patchI].evaluate();
 
-            phiv.boundaryField()[patchI] =
+            phi.boundaryField()[patchI] =
                 U.boundaryField()[patchI]
               & mesh.Sf().boundaryField()[patchI];
         }
@@ -37,21 +37,21 @@ if (mesh.changing())
         pcorrTypes
     );
 
-    surfaceScalarField rhof(fvc::interpolate(rho, "div(phiv,rho)"));
+    surfaceScalarField rhof(fvc::interpolate(rho, "div(phi,rho)"));
     dimensionedScalar rAUf("rAUf", dimTime, 1.0);
 
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pcorrEqn
         (
-            fvm::laplacian(rAUf, pcorr) == fvc::ddt(rho) + fvc::div(phiv*rhof)
+            fvm::laplacian(rAUf, pcorr) == fvc::ddt(rho) + fvc::div(phi*rhof)
         );
 
         pcorrEqn.solve();
 
         if (pimple.finalNonOrthogonalIter())
         {
-            phiv -= pcorrEqn.flux()/rhof;
+            phi -= pcorrEqn.flux()/rhof;
         }
     }
 }
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
index a0e0e6c7..b07846b6 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
@@ -17,13 +17,13 @@
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn.H();
 
-    phiv = (fvc::interpolate(HbyA) & mesh.Sf())
+    phi = (fvc::interpolate(HbyA) & mesh.Sf())
          + rhorAUf*fvc::ddtCorr(U, Uf);
-    fvc::makeRelative(phiv, U);
+    fvc::makeRelative(phi, U);
 
     surfaceScalarField phiGradp(rhorAUf*mesh.magSf()*fvc::snGrad(p));
 
-    phiv -= phiGradp/rhof;
+    phi -= phiGradp/rhof;
 
     volScalarField rho0(rho - psi*p);
 
@@ -33,7 +33,7 @@
         (
             fvc::ddt(rho)
           + psi*correction(fvm::ddt(p))
-          + fvc::div(phiv, rho)
+          + fvc::div(phi, rho)
           + fvc::div(phiGradp)
           - fvm::laplacian(rhorAUf, p)
         );
@@ -42,7 +42,7 @@
 
         if (pimple.finalNonOrthogonalIter())
         {
-            phiv += (phiGradp + pEqn.flux())/rhof;
+            phi += (phiGradp + pEqn.flux())/rhof;
         }
     }
 
@@ -85,6 +85,6 @@
     {
         Uf = fvc::interpolate(U);
         surfaceVectorField n(mesh.Sf()/mesh.magSf());
-        Uf += n*(phiv/mesh.magSf() - (n & Uf));
+        Uf += n*(phi/mesh.magSf() - (n & Uf));
     }
 }
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index c4453df3..2b04d58f 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     #include "readControls.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
-    #include "compressibleCourantNo.H"
+    #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
     pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/cavitatingFoam/createFields.H b/applications/solvers/multiphase/cavitatingFoam/createFields.H
index 605c0dee..2c834dc5 100644
--- a/applications/solvers/multiphase/cavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H
@@ -39,12 +39,25 @@
         mesh
     );
 
-    #include "createPhiv.H"
-    #include "compressibleCreatePhi.H"
+    #include "createPhi.H"
+
+    // Mass flux (corrected by rhoEqn.H)
+    surfaceScalarField rhoPhi
+    (
+        IOobject
+        (
+            "rhoPhi",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        fvc::interpolate(rho)*phi
+    );
 
     Info<< "Reading transportProperties\n" << endl;
 
-    incompressibleTwoPhaseMixture twoPhaseProperties(U, phiv);
+    incompressibleTwoPhaseMixture twoPhaseProperties(U, phi);
 
     volScalarField& alphav(twoPhaseProperties.alpha1());
     alphav.oldTime();
@@ -72,5 +85,5 @@
     // Create incompressible turbulence model
     autoPtr<incompressible::turbulenceModel> turbulence
     (
-        incompressible::turbulenceModel::New(U, phiv, twoPhaseProperties)
+        incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
     );
diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index 210a30fd..da804791 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -17,12 +17,12 @@
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn.H();
 
-    phiv = (fvc::interpolate(HbyA) & mesh.Sf())
-         + rhorAUf*fvc::ddtCorr(U, phiv);
+    phi = (fvc::interpolate(HbyA) & mesh.Sf())
+         + rhorAUf*fvc::ddtCorr(U, phi);
 
     surfaceScalarField phiGradp(rhorAUf*mesh.magSf()*fvc::snGrad(p));
 
-    phiv -= phiGradp/rhof;
+    phi -= phiGradp/rhof;
 
     while (pimple.correctNonOrthogonal())
     {
@@ -30,7 +30,7 @@
         (
             fvm::ddt(psi, p)
           - (rhol0 + (psil - psiv)*pSat)*fvc::ddt(alphav) - pSat*fvc::ddt(psi)
-          + fvc::div(phiv, rho)
+          + fvc::div(phi, rho)
           + fvc::div(phiGradp)
           - fvm::laplacian(rhorAUf, p)
         );
@@ -39,7 +39,7 @@
 
         if (pimple.finalNonOrthogonalIter())
         {
-            phiv += (phiGradp + pEqn.flux())/rhof;
+            phi += (phiGradp + pEqn.flux())/rhof;
         }
     }
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/rhoEqn.H b/applications/solvers/multiphase/cavitatingFoam/rhoEqn.H
index d0bd6e1d..a01823ad 100644
--- a/applications/solvers/multiphase/cavitatingFoam/rhoEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/rhoEqn.H
@@ -2,12 +2,12 @@
     fvScalarMatrix rhoEqn
     (
         fvm::ddt(rho)
-      + fvm::div(phiv, rho)
+      + fvm::div(phi, rho)
     );
 
     rhoEqn.solve();
 
-    phi = rhoEqn.flux();
+    rhoPhi = rhoEqn.flux();
 
     Info<< "max-min rho: " << max(rho).value()
         << " " << min(rho).value() << endl;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/U b/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
index b668f3ee..5a3e81c4 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour b/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
index 8fdc3849..c0f1b3dc 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/k b/tutorials/multiphase/cavitatingFoam/les/throttle/0/k
index 7482950a..184e8511 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/k
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs
index 6c958c67..71b6fec5 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/p b/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
index 7cfeca1d..3f596fbb 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -24,7 +24,6 @@ boundaryField
     {
         type            totalPressure;
         U               U;
-        phi             phiv;
         rho             rho;
         psi             none;
         gamma           1;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho b/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho
index d6f5118f..4f07d57e 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties
index 2f9a977a..b9e351e4 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
index a2435dfd..53b23eea 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties
index 43505ed1..3a264a14 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
index 639ad920..e5a1acf2 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties
index 9fc2dcb5..9e29fab3 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 914c209f..4e7c7019 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
index 5a5f05f9..41816058 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -28,9 +28,9 @@ interpolationSchemes
 divSchemes
 {
     default         none;
-    div(phiv,rho)   Gauss vanLeer;
-    div(phi,U)      Gauss LUST grad(U);
-    div(phiv,k)     Gauss LUST grad(k);
+    div(phi,rho)    Gauss vanLeer;
+    div(rhoPhi,U)   Gauss LUST grad(U);
+    div(phi,k)      Gauss LUST grad(k);
     div((muEff*dev(T(grad(U))))) Gauss linear;
 }
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
index bc73a51b..cca8c86e 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -78,5 +78,13 @@ PIMPLE
     nNonOrthogonalCorrectors 0;
 }
 
+relaxationFactors
+{
+    equations
+    {
+        ".*" 1;
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict
index 6091b835..25d8a50b 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
index a07e3b0e..06bc3981 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
index 70230a42..2c8235f4 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
index 5cfe701c..438b238f 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
index 6cd1f107..8c39bdda 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour
index ee246adc..240a5868 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k
index 6c3f8a91..18f9de12 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs
index 11048842..9ed8c9bc 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p
index 58317786..075a6f44 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -24,7 +24,6 @@ boundaryField
     {
         type            totalPressure;
         U               U;
-        phi             phiv;
         rho             rho;
         psi             none;
         gamma           1;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho
index 3382008a..02a94b71 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties
index 2f9a977a..b9e351e4 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
index cb1c584a..fbe2a457 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
index 43505ed1..3a264a14 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
index 639ad920..e5a1acf2 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties
index 9fc2dcb5..9e29fab3 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index abe02152..3154dff3 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict
index 21583efc..9c4739d9 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
index e53b27b1..a603aeb9 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -29,9 +29,9 @@ divSchemes
 {
     default         none;
 
-    div(phiv,rho)   Gauss vanLeer;
-    div(phi,U)      Gauss LUST grad(U);
-    div(phiv,k)     Gauss LUST grad(k);
+    div(phi,rho)    Gauss vanLeer;
+    div(rhoPhi,U)   Gauss LUST grad(U);
+    div(phi,k)      Gauss LUST grad(k);
     div((muEff*dev(T(grad(U))))) Gauss linear;
 }
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
index 92636c98..92447930 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -75,5 +75,13 @@ PIMPLE
     nNonOrthogonalCorrectors 0;
 }
 
+relaxationFactors
+{
+    equations
+    {
+        ".*" 1;
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict
index 2f6d850d..ca76f667 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict
index c6d4f075..f832f09f 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
index a07e3b0e..06bc3981 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
index 70230a42..2c8235f4 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
index 5cfe701c..438b238f 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
index b668f3ee..5a3e81c4 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
index 8fdc3849..c0f1b3dc 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k
index 7482950a..184e8511 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut
index e977119a..64cdf411 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega
index feff1b56..089a50ec 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
index 7cfeca1d..3f596fbb 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -24,7 +24,6 @@ boundaryField
     {
         type            totalPressure;
         U               U;
-        phi             phiv;
         rho             rho;
         psi             none;
         gamma           1;
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho
index d6f5118f..4f07d57e 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties
index 67cc1be5..a9bf0494 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
index a2435dfd..53b23eea 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
index 43505ed1..3a264a14 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
index 639ad920..e5a1acf2 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties
index 17a36ec3..fa68b262 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
index b0503025..f5742f35 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
index 60e373b3..f49209f6 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -28,10 +28,10 @@ interpolationSchemes
 divSchemes
 {
     default         none;
-    div(phiv,rho)   Gauss limitedLinear 1;
-    div(phi,U)      Gauss limitedLinearV 1;
-    div(phiv,omega) Gauss limitedLinear 1;
-    div(phiv,k)     Gauss limitedLinear 1;
+    div(phi,rho)    Gauss limitedLinear 1;
+    div(rhoPhi,U)   Gauss limitedLinearV 1;
+    div(phi,omega)  Gauss limitedLinear 1;
+    div(phi,k)      Gauss limitedLinear 1;
     div((muEff*dev(T(grad(U))))) Gauss linear;
 }
 
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
index bc73a51b..2da9db65 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -33,7 +33,6 @@ solvers
         relTol          0;
     }
 
-
     p
     {
         solver          GAMG;
@@ -78,5 +77,13 @@ PIMPLE
     nNonOrthogonalCorrectors 0;
 }
 
+relaxationFactors
+{
+    equations
+    {
+        ".*" 1;
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict
index 6091b835..25d8a50b 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
index a07e3b0e..06bc3981 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
index 70230a42..2c8235f4 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
index 5cfe701c..438b238f 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/