diff --git a/Allwmake b/Allwmake
index 749c60fc8..3dcdff3e7 100755
--- a/Allwmake
+++ b/Allwmake
@@ -1,19 +1,27 @@
 #!/bin/sh
-set -x
+cd ${0%/*} || exit 1    # run from this directory
 
-# run from this directory only
-cd ${0%/*} || exit 1
+if [ "$PWD" != "$WM_PROJECT_DIR" ]
+then
+    echo "Error: Current directory is not \$WM_PROJECT_DIR"
+    echo "    The environment variable are not consistent with the installation."
+    echo "    Check the OpenFOAM entries in your dot-files and source them."
+    exit 1
+fi
 
 # wmake is required for subsequent targets
-(cd wmake/src && make)
+( cd wmake/src && make )
 
-(cd $WM_THIRD_PARTY_DIR && ./Allwmake)
+# build ThirdParty sources
+( cd $WM_THIRD_PARTY_DIR && ./Allwmake )
 
-(cd src && ./Allwmake)
-
-(cd applications && ./Allwmake)
+# build OpenFOAM libraries and applications
+src/Allwmake
+applications/Allwmake
 
 if [ "$1" = doc ]
 then
-   (cd doc && ./Allwmake)
+    doc/Allwmake
 fi
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/Allwmake b/applications/Allwmake
index 7437e4f9b..82a2ec0df 100755
--- a/applications/Allwmake
+++ b/applications/Allwmake
@@ -1,5 +1,17 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+if [ "$PWD" != "$WM_PROJECT_DIR/applications" ]
+then
+    echo "Error: Current directory in not \$WM_PROJECT_DIR/applications"
+    echo "    The environment variable are not consistent with the installation."
+    echo "    Check the OpenFOAM entries in your dot-files and source them."
+    exit 1
+fi
+
 set -x
 
-( cd solvers && wmake all )
-( cd utilities && wmake all )
+wmake all solvers
+wmake all utilities
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index bb76f0ce9..77f897135 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -77,12 +77,6 @@ int main(int argc, char *argv[])
         Info<< "Crank angle = " << runTime.theta() << " CA-deg" << endl;
 
         mesh.move();
-        Check that this is unnecessary. HJ
-        // 1.6.x merge.  HJ, 26/Aug/2010
-        const_cast<volPointInterpolation&>
-        (
-            volPointInterpolation::New(mesh)
-        ).updateMesh();
 
         dieselSpray.evolve();
 
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/Make/options b/applications/solvers/engine/sonicTurbDyMEngineFoam/Make/options
index 1383b9ac5..d463180c5 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/Make/options
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/Make/options
@@ -4,7 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel
 
 EXE_LIBS = \
     -lengine \
@@ -12,6 +12,7 @@ EXE_LIBS = \
     -ldynamicMesh \
     -ltopoChangerFvMesh \
     -lcompressibleRASModels \
+    -lcompressibleLESModels \
     -lbasicThermophysicalModels \
     -lspecie \
     -lmeshTools \
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/createFields.H b/applications/solvers/engine/sonicTurbDyMEngineFoam/createFields.H
index b87373e87..a55b6a621 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/createFields.H
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/createFields.H
@@ -2,10 +2,11 @@
 
     Info<< "Reading thermophysical properties\n" << endl;
 
-    autoPtr<basicThermo> thermo
+    autoPtr<basicPsiThermo> pThermo
     (
-        basicThermo::New(mesh)
+        basicPsiThermo::New(mesh)
     );
+    basicPsiThermo& thermo = pThermo();
 
     volScalarField rho
     (
@@ -17,16 +18,16 @@
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        thermo->rho()
+        thermo.rho()
     );
     rho.oldTime();
 
-    volScalarField& p = thermo->p();
+    volScalarField& p = thermo.p();
     p.oldTime();
-    
-    const volScalarField& psi = thermo->psi();
-    const volScalarField& T = thermo->T();
-    volScalarField& h = thermo->h();
+
+    const volScalarField& psi = thermo.psi();
+    const volScalarField& T = thermo.T();
+    volScalarField& h = thermo.h();
 
 
     Info<< "\nReading field U\n" << endl;
@@ -47,14 +48,14 @@
 
 
     Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASModel> turbulence
+    autoPtr<compressible::turbulenceModel> turbulence
     (
-        compressible::RASModel::New
+        compressible::turbulenceModel::New
         (
             rho,
             U,
             phi,
-            thermo()
+            thermo
         )
     );
 
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/hEqn.H b/applications/solvers/engine/sonicTurbDyMEngineFoam/hEqn.H
index 4d65bbc46..530b4ef30 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/hEqn.H
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/hEqn.H
@@ -11,5 +11,5 @@
 
     hEqn.solve();
 
-    thermo->correct();
+    thermo.correct();
 }
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/pEqn.H b/applications/solvers/engine/sonicTurbDyMEngineFoam/pEqn.H
index 623caef9c..7ea343d36 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/pEqn.H
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/pEqn.H
@@ -1,12 +1,12 @@
 {
-    rho = thermo->rho();
+    rho = thermo.rho();
 
     rUA = 1.0/UEqn.A();
     H = UEqn.H();
     U = rUA*UEqn.H();
 
     phi = fvc::interpolate(rho)
-         *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)); 
+         *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U));
 
     // Store pressure for under-relaxation
     p.storePrevIter();
@@ -24,7 +24,7 @@
 
         if (nonOrth == nNonOrthCorr)
         {
-            phi += pEqn.flux(); 
+            phi += pEqn.flux();
         }
     }
 
@@ -35,8 +35,8 @@
     // rho does not carry working boundary conditions and needs to be updated
     // strictly according to the thermodynamics package
     // HJ, 22/Aug/2007
-    thermo->correct();
-    rho = thermo->rho();
+    thermo.correct();
+    rho = thermo.rho();
 
     DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
 
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C b/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
index 9b44ff56f..9b5f522d4 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
@@ -26,7 +26,7 @@ Application
     sonicTurbDyMEngineFoam
 
 Description
-    Solver for compressible cold flow in internal combustion engines 
+    Solver for compressible cold flow in internal combustion engines
     with mesh motion and topological changes.
 
 
@@ -36,8 +36,8 @@ Description
 #include "engineTime.H"
 #include "dynamicFvMesh.H"
 #include "engineTopoChangerMesh.H"
-#include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "basicPsiThermo.H"
+#include "turbulenceModel.H"
 #include "Switch.H"
 #include "OFstream.H"
 
@@ -61,8 +61,8 @@ int main(int argc, char *argv[])
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    thermo->correct();
-    
+    thermo.correct();
+
     Info << "\nStarting time loop\n" << endl;
 
     while (runTime.run())
@@ -72,24 +72,24 @@ int main(int argc, char *argv[])
 #       include "setDeltaT.H"
 
         runTime++;
-                
+
         Info<< "Crank angle = " << runTime.theta() << " CA-deg" << endl;
 
 //      make phi relative
-        
+
         phi += meshFlux;
-        
+
         bool meshChanged = mesh.update();
 
         if(meshChanged)
         {
-            thermo->correct();
+            thermo.correct();
 
 #           include "checkTotalVolume.H"
 #           include "compressibleCorrectPhi.H"
 #           include "CourantNo.H"
         }
-        
+
         meshFlux = fvc::interpolate(rho)*fvc::meshPhi(rho, U);
 
         // Make phi absolute
@@ -109,11 +109,11 @@ int main(int argc, char *argv[])
         }
 
         turbulence->correct();
-        
+
 #       include "logSummary.H"
 
-        rho = thermo->rho();
-    
+        rho = thermo.rho();
+
         runTime.write();
 
 #       include "infoDataOutput.H"
diff --git a/applications/solvers/engine/turbDyMEngineFoam/Make/options b/applications/solvers/engine/turbDyMEngineFoam/Make/options
index 5582f6f44..e58f37d58 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/Make/options
+++ b/applications/solvers/engine/turbDyMEngineFoam/Make/options
@@ -4,8 +4,9 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/topoChangerFvMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
     -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
@@ -15,6 +16,7 @@ EXE_LIBS = \
     -ltopoChangerFvMesh \
     -lmeshTools \
     -lincompressibleRASModels \
+    -lincompressibleLESModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     $(WM_DECOMP_LIBS)
diff --git a/applications/solvers/engine/turbDyMEngineFoam/createFields.H b/applications/solvers/engine/turbDyMEngineFoam/createFields.H
index c887b7ab2..2db24767d 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/createFields.H
+++ b/applications/solvers/engine/turbDyMEngineFoam/createFields.H
@@ -39,9 +39,9 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    autoPtr<incompressible::RASModel> turbulence
+    autoPtr<incompressible::turbulenceModel> turbulence
     (
-        incompressible::RASModel::New(U, phi, laminarTransport)
+        incompressible::turbulenceModel::New(U, phi, laminarTransport)
     );
 
     Info<< "Reading field rUA if present\n" << endl;
diff --git a/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C b/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C
index 70abf3ba3..94ea3df8c 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C
+++ b/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C
@@ -32,8 +32,8 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASModel/RASModel.H"
+#include "singlePhaseTransportModel.H"
+#include "turbulenceModel.H"
 #include "dynamicFvMesh.H"
 #include "engineTime.H"
 
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
                 {
                     pEqn.solve(mesh.solver(p.name()));
                 }
-            
+
                 if (nonOrth == nNonOrthCorr)
                 {
                     phi -= pEqn.flux();
diff --git a/applications/solvers/heatTransfer/boussinesqBuoyantFoam/boussinesqBuoyantFoam.C b/applications/solvers/heatTransfer/boussinesqBuoyantFoam/boussinesqBuoyantFoam.C
index 600236af6..5051eb54d 100644
--- a/applications/solvers/heatTransfer/boussinesqBuoyantFoam/boussinesqBuoyantFoam.C
+++ b/applications/solvers/heatTransfer/boussinesqBuoyantFoam/boussinesqBuoyantFoam.C
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 #   include "readTransportProperties.H"
-#   include "readEnvironmentalProperties.H"
+#   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
index 85f88ce13..7e08febe3 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
@@ -43,15 +43,15 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
-    #include "createTime.H"
-    #include "createMesh.H"
-    #include "readGravitationalAcceleration.H"
-    #include "createFields.H"
-    #include "initContinuityErrs.H"
-    #include "readTimeControls.H"
-    #include "compressibleCourantNo.H"
-    #include "setInitialDeltaT.H"
+#   include "setRootCase.H"
+#   include "createTime.H"
+#   include "createMesh.H"
+#   include "readGravitationalAcceleration.H"
+#   include "createFields.H"
+#   include "initContinuityErrs.H"
+#   include "readTimeControls.H"
+#   include "compressibleCourantNo.H"
+#   include "setInitialDeltaT.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -59,26 +59,26 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readTimeControls.H"
-        #include "readPISOControls.H"
-        #include "compressibleCourantNo.H"
-        #include "setDeltaT.H"
+#       include "readTimeControls.H"
+#       include "readPISOControls.H"
+#       include "compressibleCourantNo.H"
+#       include "setDeltaT.H"
 
         runTime++;
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        #include "rhoEqn.H"
+#       include "rhoEqn.H"
 
-        #include "UEqn.H"
+#       include "UEqn.H"
 
-        #include "hEqn.H"
+#       include "hEqn.H"
 
         // --- PISO loop
 
         for (int corr=0; corr<nCorr; corr++)
         {
-            #include "pEqn.H"
+#           include "pEqn.H"
         }
 
         turbulence->correct();
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
index 214602005..aa905ae78 100644
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
@@ -26,7 +26,7 @@ Application
     bubbleFoam
 
 Description
-    Solver for a system of 2 incompressible fluid phases with one phase 
+    Solver for a system of 2 incompressible fluid phases with one phase
     dispersed, e.g. gas bubbles in a liquid.
 
 \*---------------------------------------------------------------------------*/
@@ -40,12 +40,11 @@ Description
 
 int main(int argc, char *argv[])
 {
-
 #   include "setRootCase.H"
 
 #   include "createTime.H"
 #   include "createMesh.H"
-#   include "readEnvironmentalProperties.H"
+#   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 
@@ -53,7 +52,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    for (runTime++; !runTime.end(); runTime++)
+    while (runTime.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/CourantNo.H b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H
similarity index 100%
rename from applications/solvers/multiphase/lesCavitatingFoam/CourantNo.H
rename to applications/solvers/multiphase/cavitatingFoam/CourantNo.H
diff --git a/applications/solvers/multiphase/cavitatingFoam/Make/files b/applications/solvers/multiphase/cavitatingFoam/Make/files
new file mode 100644
index 000000000..832391f03
--- /dev/null
+++ b/applications/solvers/multiphase/cavitatingFoam/Make/files
@@ -0,0 +1,3 @@
+cavitatingFoam.C
+
+EXE = $(FOAM_APPBIN)/cavitatingFoam
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/Make/options
similarity index 81%
rename from applications/solvers/multiphase/rasCavitatingFoam/Make/options
rename to applications/solvers/multiphase/cavitatingFoam/Make/options
index a694ac217..9cb749d63 100644
--- a/applications/solvers/multiphase/rasCavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/cavitatingFoam/Make/options
@@ -3,12 +3,12 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
     -I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude
 
 EXE_LIBS = \
     -lincompressibleTransportModels \
     -lincompressibleRASModels \
+    -lincompressibleLESModels \
     -lfiniteVolume \
     -lbarotropicCompressibilityModel
-
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/UEqn.H b/applications/solvers/multiphase/cavitatingFoam/UEqn.H
similarity index 86%
rename from applications/solvers/multiphase/rasCavitatingFoam/UEqn.H
rename to applications/solvers/multiphase/cavitatingFoam/UEqn.H
index 374e410c2..01911faaa 100644
--- a/applications/solvers/multiphase/rasCavitatingFoam/UEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/UEqn.H
@@ -14,7 +14,11 @@
       - fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
     );
 
+    UEqn.relax();
+
     if (momentumPredictor)
     {
         solve(UEqn == -fvc::grad(p));
     }
+
+    Info<< "max(U) " << max(mag(U)).value() << endl;
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
similarity index 70%
rename from applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C
rename to applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index 8fa6a7a69..e149fdc59 100644
--- a/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -23,56 +23,58 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    rasCavitatingFoam
+    cavitatingFoam
 
 Description
-    Transient cavitation code with RAS turbulence.
+    Transient cavitation code based on the homogeneous equilibrium model
+    from which the compressibility of the liquid/vapour "mixture" is obtained.
+
+    Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "barotropicCompressibilityModel.H"
 #include "twoPhaseMixture.H"
-#include "incompressible/RASModel/RASModel.H"
+#include "turbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
+    #include "setRootCase.H"
 
-#   include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "readThermodynamicProperties.H"
+    #include "readControls.H"
+    #include "createFields.H"
+    #include "initContinuityErrs.H"
+    #include "compressibleCourantNo.H"
+    #include "setInitialDeltaT.H"
 
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "readThermodynamicProperties.H"
-#   include "readControls.H"
-#   include "createFields.H"
-#   include "initContinuityErrs.H"
-#   include "compressibleCourantNo.H"
-#   include "setInitialDeltaT.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
     {
-#       include "readControls.H"
-#       include "CourantNo.H"
-#       include "setDeltaT.H"
+        #include "readControls.H"
+        #include "CourantNo.H"
+        #include "setDeltaT.H"
 
         runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         for (int outerCorr=0; outerCorr<nOuterCorr; outerCorr++)
         {
-#           include "rhoEqn.H"
-#           include "gammaPsi.H"
-#           include "UEqn.H"
+            #include "rhoEqn.H"
+            #include "gammaPsi.H"
+            #include "UEqn.H"
 
             for (int corr=0; corr<nCorr; corr++)
             {
-#               include "pEqn.H"
+                #include "pEqn.H"
             }
         }
 
@@ -87,7 +89,7 @@ int main(int argc, char *argv[])
 
     Info<< "\n end \n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/continuityErrs.H b/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H
similarity index 100%
rename from applications/solvers/multiphase/lesCavitatingFoam/continuityErrs.H
rename to applications/solvers/multiphase/cavitatingFoam/continuityErrs.H
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/createFields.H b/applications/solvers/multiphase/cavitatingFoam/createFields.H
similarity index 86%
rename from applications/solvers/multiphase/rasCavitatingFoam/createFields.H
rename to applications/solvers/multiphase/cavitatingFoam/createFields.H
index 37ff01d41..49c7de147 100644
--- a/applications/solvers/multiphase/rasCavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H
@@ -71,15 +71,15 @@
         mesh
     );
 
-#   include "createPhiv.H"
-#   include "compressibleCreatePhi.H"
+    #include "createPhiv.H"
+    #include "compressibleCreatePhi.H"
 
     Info<< "Reading transportProperties\n" << endl;
 
     twoPhaseMixture twoPhaseProperties(U, phiv, "gamma");
 
-    // Create RAS turbulence model
-    autoPtr<incompressible::RASModel> turbulence
+    // Create incompressible turbulence model
+    autoPtr<incompressible::turbulenceModel> turbulence
     (
-        incompressible::RASModel::New(U, phiv, twoPhaseProperties)
+        incompressible::turbulenceModel::New(U, phiv, twoPhaseProperties)
     );
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/gammaPsi.H b/applications/solvers/multiphase/cavitatingFoam/gammaPsi.H
similarity index 100%
rename from applications/solvers/multiphase/lesCavitatingFoam/gammaPsi.H
rename to applications/solvers/multiphase/cavitatingFoam/gammaPsi.H
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
similarity index 72%
rename from applications/solvers/multiphase/rasCavitatingFoam/pEqn.H
rename to applications/solvers/multiphase/cavitatingFoam/pEqn.H
index c9382dfc0..bcaedb7a1 100644
--- a/applications/solvers/multiphase/rasCavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -1,7 +1,7 @@
 {
     if (nOuterCorr == 1)
     {
-        p = 
+        p =
         (
             rho
           - (1.0 - gamma)*rhol0
@@ -24,7 +24,7 @@
 
     phiv -= phiGradp/rhof;
 
-#   include "resetPhivPatches.H"
+    #include "resetPhivPatches.H"
 
     for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
@@ -37,7 +37,14 @@
           - fvm::laplacian(rUAf, p)
         );
 
-        pEqn.solve();
+        if (corr == nCorr-1 && nonOrth == nNonOrthCorr)
+        {
+            pEqn.solve(mesh.solver(p.name() + "Final"));
+        }
+        else
+        {
+            pEqn.solve(mesh.solver(p.name()));
+        }
 
         if (nonOrth == nNonOrthCorr)
         {
@@ -45,9 +52,32 @@
         }
     }
 
-    Info<< "max-min p: " << max(p).value()
+    Info<< "Predicted p max-min : " << max(p).value()
         << " " << min(p).value() << endl;
 
+    rho == max
+    (
+        psi*p
+      + (1.0 - gamma)*rhol0
+      + ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat,
+        rhoMin
+    );
+
+    #include "gammaPsi.H"
+
+    p =
+    (
+        rho
+      - (1.0 - gamma)*rhol0
+      - ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat
+    )/psi;
+
+    p.correctBoundaryConditions();
+
+    Info<< "Phase-change corrected p max-min : " << max(p).value()
+        << " " << min(p).value() << endl;
+
+    // Correct velocity
 
     U = HbyA - rUA*fvc::grad(p);
 
@@ -63,18 +93,4 @@
     U.correctBoundaryConditions();
 
     Info<< "max(U) " << max(mag(U)).value() << endl;
-
-    rho == max
-    (
-        psi*p
-      + (1.0 - gamma)*rhol0
-      + ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat,
-        rhoMin
-    );
-
-    Info<< "max-min rho: " << max(rho).value()
-        << " " << min(rho).value() << endl;
-
-#   include "gammaPsi.H"
-
 }
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/readControls.H b/applications/solvers/multiphase/cavitatingFoam/readControls.H
similarity index 100%
rename from applications/solvers/multiphase/lesCavitatingFoam/readControls.H
rename to applications/solvers/multiphase/cavitatingFoam/readControls.H
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/readThermodynamicProperties.H b/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H
similarity index 100%
rename from applications/solvers/multiphase/lesCavitatingFoam/readThermodynamicProperties.H
rename to applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/resetPhiPatches.H b/applications/solvers/multiphase/cavitatingFoam/resetPhiPatches.H
similarity index 100%
rename from applications/solvers/multiphase/lesCavitatingFoam/resetPhiPatches.H
rename to applications/solvers/multiphase/cavitatingFoam/resetPhiPatches.H
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/resetPhivPatches.H b/applications/solvers/multiphase/cavitatingFoam/resetPhivPatches.H
similarity index 100%
rename from applications/solvers/multiphase/lesCavitatingFoam/resetPhivPatches.H
rename to applications/solvers/multiphase/cavitatingFoam/resetPhivPatches.H
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/rhoEqn.H b/applications/solvers/multiphase/cavitatingFoam/rhoEqn.H
similarity index 100%
rename from applications/solvers/multiphase/lesCavitatingFoam/rhoEqn.H
rename to applications/solvers/multiphase/cavitatingFoam/rhoEqn.H
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/setDeltaT.H b/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H
similarity index 100%
rename from applications/solvers/multiphase/lesCavitatingFoam/setDeltaT.H
rename to applications/solvers/multiphase/cavitatingFoam/setDeltaT.H
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/setInitialDeltaT.H b/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
similarity index 100%
rename from applications/solvers/multiphase/lesCavitatingFoam/setInitialDeltaT.H
rename to applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/Make/files b/applications/solvers/multiphase/compressibleInterDyMFoam/Make/files
new file mode 100644
index 000000000..121264b1a
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/Make/files
@@ -0,0 +1,3 @@
+compressibleInterDyMFoam.C
+
+EXE = $(FOAM_APPBIN)/compressibleInterDyMFoam
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/Make/options b/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options
similarity index 51%
rename from applications/solvers/multiphase/lesCavitatingFoam/Make/options
rename to applications/solvers/multiphase/compressibleInterDyMFoam/Make/options
index 91833c136..af146aaa3 100644
--- a/applications/solvers/multiphase/lesCavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options
@@ -1,16 +1,20 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES \
-    -I$(LIB_SRC)/turbulenceModels/LES/incompressible/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude
 
 EXE_LIBS = \
+    -linterfaceProperties \
     -lincompressibleTransportModels \
+    -lincompressibleRASModels \
     -lincompressibleLESModels \
     -lfiniteVolume \
-    -lbarotropicCompressibilityModel
+    -ldynamicMesh \
+    -lmeshTools \
+    -ldynamicFvMesh
 
diff --git a/applications/solvers/multiphase/lesInterFoam/UEqn.H b/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H
similarity index 66%
rename from applications/solvers/multiphase/lesInterFoam/UEqn.H
rename to applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H
index 1bf56f02d..138e58fc7 100644
--- a/applications/solvers/multiphase/lesInterFoam/UEqn.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H
@@ -2,7 +2,7 @@
     (
         "muEff",
         twoPhaseProperties.muf()
-      + fvc::interpolate(rho*turbulence->nuSgs())
+      + fvc::interpolate(rho*turbulence->nut())
     );
 
     fvVectorMatrix UEqn
@@ -11,9 +11,11 @@
       + fvm::div(rhoPhi, U)
       - fvm::laplacian(muEff, U)
       - (fvc::grad(U) & fvc::grad(muEff))
-    //- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
+    //- fvc::div(muf*(mesh.Sf() & fvc::interpolate(fvc::grad(U)().T())))
     );
 
+    UEqn.relax();
+
     if (momentumPredictor)
     {
         solve
@@ -22,10 +24,10 @@
          ==
             fvc::reconstruct
             (
-                (
-                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
-                  - ghf*fvc::snGrad(rho)
-                  - fvc::snGrad(pd)
+                fvc::interpolate(rho)*(g & mesh.Sf())
+              + (
+                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
+                  - fvc::snGrad(p)
                 ) * mesh.magSf()
             )
         );
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/alphaEqns.H b/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqns.H
similarity index 95%
rename from applications/solvers/multiphase/compressibleLesInterFoam/alphaEqns.H
rename to applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqns.H
index 819cd0f53..dd704c069 100644
--- a/applications/solvers/multiphase/compressibleLesInterFoam/alphaEqns.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqns.H
@@ -59,7 +59,7 @@
                 alpharScheme
             );
 
-        MULES::explicitSolve(oneField(), alpha1, phi, phiAlpha1, Sp, Su, 1, 0);
+        MULES::explicitSolve(geometricOneField(), alpha1, phi, phiAlpha1, Sp, Su, 1, 0);
 
         surfaceScalarField rho1f = fvc::interpolate(rho1);
         surfaceScalarField rho2f = fvc::interpolate(rho2);
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H
similarity index 87%
rename from applications/solvers/multiphase/compressibleLesInterFoam/alphaEqnsSubCycle.H
rename to applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H
index c52dce969..32a716313 100644
--- a/applications/solvers/multiphase/compressibleLesInterFoam/alphaEqnsSubCycle.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H
@@ -10,9 +10,11 @@
     );
 
     surfaceScalarField phic = mag(phi/mesh.magSf());
-    phic = min(interface.cGamma()*phic, max(phic));
+    phic = min(interface.cAlpha()*phic, max(phic));
 
+    fvc::makeAbsolute(phi, U);
     volScalarField divU = fvc::div(phi);
+    fvc::makeRelative(phi, U);
 
     if (nAlphaSubCycles > 1)
     {
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
new file mode 100644
index 000000000..c4cfbc48e
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -0,0 +1,142 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+    compressibleLesInterFoam
+
+Description
+    Solver for 2 compressible, isothermal immiscible fluids using a VOF
+    (volume of fluid) phase-fraction based interface capturing approach,
+    with optional mesh motion and mesh topology changes including adaptive
+    re-meshing.
+
+    The momentum and other fluid properties are of the "mixture" and a
+    single momentum equation is solved.  Turbulence modelling is generic,
+    i.e. laminar, RAS or LES may be selected.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "dynamicFvMesh.H"
+#include "MULES.H"
+#include "subCycle.H"
+#include "interfaceProperties.H"
+#include "twoPhaseMixture.H"
+#include "turbulenceModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createDynamicFvMesh.H"
+    #include "readGravitationalAcceleration.H"
+    #include "readControls.H"
+    #include "initContinuityErrs.H"
+    #include "createFields.H"
+    #include "CourantNo.H"
+    #include "setInitialDeltaT.H"
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    Info<< "\nStarting time loop\n" << endl;
+
+    while (runTime.run())
+    {
+        #include "readControls.H"
+        #include "CourantNo.H"
+
+        // Make the fluxes absolute
+        fvc::makeAbsolute(phi, U);
+
+        #include "setDeltaT.H"
+
+        runTime++;
+
+        Info<< "Time = " << runTime.timeName() << nl << endl;
+
+        {
+            // Store divU from the previous mesh for the correctPhi
+            volScalarField divU = fvc::div(phi);
+
+            scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
+
+            // Do any mesh changes
+            mesh.update();
+
+            if (mesh.changing())
+            {
+                Info<< "Execution time for mesh.update() = "
+                    << runTime.elapsedCpuTime() - timeBeforeMeshUpdate
+                    << " s" << endl;
+            }
+
+            if (mesh.changing() && correctPhi)
+            {
+                #include "correctPhi.H"
+            }
+        }
+
+        // Make the fluxes relative to the mesh motion
+        fvc::makeRelative(phi, U);
+
+        if (mesh.changing() && checkMeshCourantNo)
+        {
+            #include "meshCourantNo.H"
+        }
+
+        turbulence->correct();
+
+        // --- Outer-corrector loop
+        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
+        {
+            #include "alphaEqnsSubCycle.H"
+
+            solve(fvm::ddt(rho) + fvc::div(rhoPhi));
+
+            #include "UEqn.H"
+
+            // --- PISO loop
+            for (int corr=0; corr<nCorr; corr++)
+            {
+                #include "pEqn.H"
+            }
+        }
+
+        rho = alpha1*rho1 + alpha2*rho2;
+
+        runTime.write();
+
+        Info<< "ExecutionTime = "
+            << runTime.elapsedCpuTime()
+            << " s\n\n" << endl;
+    }
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
new file mode 100644
index 000000000..f681ba659
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
@@ -0,0 +1,61 @@
+{
+    if (mesh.changing())
+    {
+        forAll(U.boundaryField(), patchi)
+        {
+            if (U.boundaryField()[patchi].fixesValue())
+            {
+                U.boundaryField()[patchi].initEvaluate();
+            }
+        }
+
+        forAll(U.boundaryField(), patchi)
+        {
+            if (U.boundaryField()[patchi].fixesValue())
+            {
+                U.boundaryField()[patchi].evaluate();
+
+                phi.boundaryField()[patchi] =
+                U.boundaryField()[patchi] & mesh.Sf().boundaryField()[patchi];
+            }
+        }
+    }
+
+    #include "continuityErrs.H"
+
+    volScalarField pcorr
+    (
+        IOobject
+        (
+            "pcorr",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("pcorr", p.dimensions(), 0.0),
+        pcorrTypes
+    );
+
+    dimensionedScalar rAUf("(1|A(U))", dimTime/rho.dimensions(), 1.0);
+
+    adjustPhi(phi, U, pcorr);
+
+    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    {
+        fvScalarMatrix pcorrEqn
+        (
+            fvm::laplacian(rAUf, pcorr) == fvc::div(phi) - divU
+        );
+
+        pcorrEqn.solve();
+
+        if (nonOrth == nNonOrthCorr)
+        {
+            phi -= pcorrEqn.flux();
+        }
+    }
+
+    #include "continuityErrs.H"
+}
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H
similarity index 79%
rename from applications/solvers/multiphase/compressibleLesInterFoam/createFields.H
rename to applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H
index 6fa5049de..3da1b5e9c 100644
--- a/applications/solvers/multiphase/compressibleLesInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H
@@ -1,9 +1,9 @@
-    Info<< "Reading field pd\n" << endl;
-    volScalarField pd
+    Info<< "Reading field p\n" << endl;
+    volScalarField p
     (
         IOobject
         (
-            "pd",
+            "p",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -46,11 +46,6 @@
     #include "createPhi.H"
 
 
-    Info<< "Calculating field g.h\n" << endl;
-    volScalarField gh("gh", g & mesh.C());
-    surfaceScalarField ghf("ghf", g & mesh.Cf());
-
-
     Info<< "Reading transportProperties\n" << endl;
     twoPhaseMixture twoPhaseProperties(U, phi);
 
@@ -88,24 +83,6 @@
 
     dimensionedScalar pMin(twoPhaseProperties.lookup("pMin"));
 
-    volScalarField p
-    (
-        IOobject
-        (
-            "p",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        max
-        (
-            (pd + gh*(alpha1*rho10 + alpha2*rho20))
-           /(1.0 - gh*(alpha1*psi1 + alpha2*psi2)),
-            pMin
-        )
-    );
-
     volScalarField rho1 = rho10 + psi1*p;
     volScalarField rho2 = rho20 + psi2*p;
 
@@ -145,8 +122,23 @@
     // Construct interface from alpha1 distribution
     interfaceProperties interface(alpha1, U, twoPhaseProperties);
 
-    // Construct LES model
-    autoPtr<incompressible::LESModel> turbulence
+    // Construct incompressible turbulence model
+    autoPtr<incompressible::turbulenceModel> turbulence
     (
-        incompressible::LESModel::New(U, phi, twoPhaseProperties)
+        incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
     );
+
+
+    wordList pcorrTypes
+    (
+        p.boundaryField().size(),
+        zeroGradientFvPatchScalarField::typeName
+    );
+
+    for (label i=0; i<p.boundaryField().size(); i++)
+    {
+        if (p.boundaryField()[i].fixesValue())
+        {
+            pcorrTypes[i] = fixedValueFvPatchScalarField::typeName;
+        }
+    }
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H
new file mode 100644
index 000000000..e6004eb9d
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H
@@ -0,0 +1,94 @@
+{
+    volScalarField rUA = 1.0/UEqn.A();
+    surfaceScalarField rUAf = fvc::interpolate(rUA);
+
+    tmp<fvScalarMatrix> pEqnComp;
+
+    if (transonic)
+    {
+        pEqnComp =
+            (fvm::ddt(p) + fvm::div(phi, p) - fvm::Sp(fvc::div(phi), p));
+    }
+    else
+    {
+        pEqnComp =
+            (fvm::ddt(p) + fvc::div(phi, p) - fvc::Sp(fvc::div(phi), p));
+    }
+
+
+    U = rUA*UEqn.H();
+
+    surfaceScalarField phiU
+    (
+        "phiU",
+        (fvc::interpolate(U) & mesh.Sf())
+    );
+
+    phi = phiU +
+        (
+            fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)*mesh.magSf()
+          + fvc::interpolate(rho)*(g & mesh.Sf())
+        )*rUAf;
+
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    {
+        fvScalarMatrix pEqnIncomp
+        (
+            fvc::div(phi)
+          - fvm::laplacian(rUAf, p)
+        );
+
+        if
+        (
+            oCorr == nOuterCorr-1
+            && corr == nCorr-1
+            && nonOrth == nNonOrthCorr
+        )
+        {
+            solve
+            (
+                (
+                    max(alpha1, scalar(0))*(psi1/rho1)
+                  + max(alpha2, scalar(0))*(psi2/rho2)
+                )
+               *pEqnComp()
+              + pEqnIncomp,
+                mesh.solver(p.name() + "Final")
+            );
+        }
+        else
+        {
+            solve
+            (
+                (
+                    max(alpha1, scalar(0))*(psi1/rho1)
+                  + max(alpha2, scalar(0))*(psi2/rho2)
+                )
+               *pEqnComp()
+              + pEqnIncomp
+            );
+        }
+
+        if (nonOrth == nNonOrthCorr)
+        {
+            dgdt =
+                (pos(alpha2)*(psi2/rho2) - pos(alpha1)*(psi1/rho1))
+               *(pEqnComp & p);
+            phi += pEqnIncomp.flux();
+        }
+    }
+
+    U += rUA*fvc::reconstruct((phi - phiU)/rUAf);
+    U.correctBoundaryConditions();
+
+    p.max(pMin);
+
+    rho1 = rho10 + psi1*p;
+    rho2 = rho20 + psi2*p;
+
+    Info<< "max(U) " << max(mag(U)).value() << endl;
+    Info<< "min(p) " << min(p).value() << endl;
+
+    // Make the fluxes relative to the mesh motion
+    fvc::makeRelative(phi, U);
+}
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
new file mode 100644
index 000000000..a2e4ef374
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
@@ -0,0 +1,32 @@
+   #include "readPISOControls.H"
+   #include "readTimeControls.H"
+
+    label nAlphaCorr
+    (
+        readLabel(piso.lookup("nAlphaCorr"))
+    );
+
+    label nAlphaSubCycles
+    (
+        readLabel(piso.lookup("nAlphaSubCycles"))
+    );
+
+    if (nAlphaSubCycles > 1 && nOuterCorr != 1)
+    {
+        FatalErrorIn(args.executable())
+            << "Sub-cycling alpha is only allowed for PISO, "
+               "i.e. when the number of outer-correctors = 1"
+            << exit(FatalError);
+    }
+
+    bool correctPhi = true;
+    if (piso.found("correctPhi"))
+    {
+        correctPhi = Switch(piso.lookup("correctPhi"));
+    }
+
+    bool checkMeshCourantNo = false;
+    if (piso.found("checkMeshCourantNo"))
+    {
+        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
+    }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/files b/applications/solvers/multiphase/compressibleInterFoam/Make/files
new file mode 100644
index 000000000..de5437219
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/Make/files
@@ -0,0 +1,3 @@
+compressibleInterFoam.C
+
+EXE = $(FOAM_APPBIN)/compressibleInterFoam
diff --git a/applications/solvers/multiphase/rasInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options
similarity index 73%
rename from applications/solvers/multiphase/rasInterFoam/Make/options
rename to applications/solvers/multiphase/compressibleInterFoam/Make/options
index bd701d51d..0e21fc2d6 100644
--- a/applications/solvers/multiphase/rasInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options
@@ -1,14 +1,13 @@
 EXE_INC = \
-    -I../interFoam \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -linterfaceProperties \
     -lincompressibleTransportModels \
     -lincompressibleRASModels \
-    -lfiniteVolume \
-    -llduSolvers
+    -lincompressibleLESModels \
+    -lfiniteVolume
diff --git a/applications/solvers/multiphase/rasInterFoam/UEqn.H b/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
similarity index 84%
rename from applications/solvers/multiphase/rasInterFoam/UEqn.H
rename to applications/solvers/multiphase/compressibleInterFoam/UEqn.H
index e5b553bfe..0b1a9ac02 100644
--- a/applications/solvers/multiphase/rasInterFoam/UEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
@@ -24,10 +24,10 @@
          ==
             fvc::reconstruct
             (
-                (
-                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
-                  - ghf*fvc::snGrad(rho)
-                  - fvc::snGrad(pd)
+                fvc::interpolate(rho)*(g & mesh.Sf())
+              + (
+                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
+                  - fvc::snGrad(p)
                 ) * mesh.magSf()
             )
         );
diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H b/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H
new file mode 100644
index 000000000..dd704c069
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H
@@ -0,0 +1,76 @@
+{
+    word alphaScheme("div(phi,alpha)");
+    word alpharScheme("div(phirb,alpha)");
+
+    surfaceScalarField phir = phic*interface.nHatf();
+
+    for (int gCorr=0; gCorr<nAlphaCorr; gCorr++)
+    {
+        volScalarField::DimensionedInternalField Sp
+        (
+            IOobject
+            (
+                "Sp",
+                runTime.timeName(),
+                mesh
+            ),
+            mesh,
+            dimensionedScalar("Sp", dgdt.dimensions(), 0.0)
+        );
+
+        volScalarField::DimensionedInternalField Su
+        (
+            IOobject
+            (
+                "Su",
+                runTime.timeName(),
+                mesh
+            ),
+            // Divergence term is handled explicitly to be
+            // consistent with the explicit transport solution
+            divU*min(alpha1, scalar(1))
+        );
+
+        forAll(dgdt, celli)
+        {
+            if (dgdt[celli] > 0.0 && alpha1[celli] > 0.0)
+            {
+                Sp[celli] -= dgdt[celli]*alpha1[celli];
+                Su[celli] += dgdt[celli]*alpha1[celli];
+            }
+            else if (dgdt[celli] < 0.0 && alpha1[celli] < 1.0)
+            {
+                Sp[celli] += dgdt[celli]*(1.0 - alpha1[celli]);
+            }
+        }
+
+
+        surfaceScalarField phiAlpha1 =
+            fvc::flux
+            (
+                phi,
+                alpha1,
+                alphaScheme
+            )
+          + fvc::flux
+            (
+                -fvc::flux(-phir, alpha2, alpharScheme),
+                alpha1,
+                alpharScheme
+            );
+
+        MULES::explicitSolve(geometricOneField(), alpha1, phi, phiAlpha1, Sp, Su, 1, 0);
+
+        surfaceScalarField rho1f = fvc::interpolate(rho1);
+        surfaceScalarField rho2f = fvc::interpolate(rho2);
+        rhoPhi = phiAlpha1*(rho1f - rho2f) + phi*rho2f;
+
+        alpha2 = scalar(1) - alpha1;
+    }
+
+    Info<< "Liquid phase volume fraction = "
+        << alpha1.weightedAverage(mesh.V()).value()
+        << "  Min(alpha1) = " << min(alpha1).value()
+        << "  Min(alpha2) = " << min(alpha2).value()
+        << endl;
+}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
new file mode 100644
index 000000000..89ba7a4e7
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
@@ -0,0 +1,43 @@
+{
+    label nAlphaCorr
+    (
+        readLabel(piso.lookup("nAlphaCorr"))
+    );
+
+    label nAlphaSubCycles
+    (
+        readLabel(piso.lookup("nAlphaSubCycles"))
+    );
+
+    surfaceScalarField phic = mag(phi/mesh.magSf());
+    phic = min(interface.cAlpha()*phic, max(phic));
+
+    volScalarField divU = fvc::div(phi);
+
+    if (nAlphaSubCycles > 1)
+    {
+        dimensionedScalar totalDeltaT = runTime.deltaT();
+        surfaceScalarField rhoPhiSum = 0.0*rhoPhi;
+
+        for
+        (
+            subCycle<volScalarField> alphaSubCycle(alpha1, nAlphaSubCycles);
+            !(++alphaSubCycle).end();
+        )
+        {
+            #include "alphaEqns.H"
+            rhoPhiSum += (runTime.deltaT()/totalDeltaT)*rhoPhi;
+        }
+
+        rhoPhi = rhoPhiSum;
+    }
+    else
+    {
+        #include "alphaEqns.H"
+    }
+
+    if (oCorr == 0)
+    {
+        interface.correct();
+    }
+}
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/compressibleLesInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
similarity index 92%
rename from applications/solvers/multiphase/compressibleLesInterFoam/compressibleLesInterFoam.C
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index becf85fa9..0689d1ec0 100644
--- a/applications/solvers/multiphase/compressibleLesInterFoam/compressibleLesInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -23,14 +23,16 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    compressibleLesInterFoam
+    compressibleInterFoam
 
 Description
     Solver for 2 compressible, isothermal immiscible fluids using a VOF
     (volume of fluid) phase-fraction based interface capturing approach.
+
     The momentum and other fluid properties are of the "mixture" and a single
-    momentum equation is solved.  Turbulence is modelled using a run-time
-    selectable incompressible LES model.
+    momentum equation is solved.
+
+    Turbulence modelling is generic, i.e.  laminar, RAS or LES may be selected.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,7 +41,7 @@ Description
 #include "subCycle.H"
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
-#include "incompressible/LESModel/LESModel.H"
+#include "turbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,7 +50,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
@@ -69,8 +71,6 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        turbulence->correct();
-
         // --- Outer-corrector loop
         for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
         {
@@ -89,6 +89,8 @@ int main(int argc, char *argv[])
 
         rho = alpha1*rho1 + alpha2*rho2;
 
+        turbulence->correct();
+
         runTime.write();
 
         Info<< "ExecutionTime = "
@@ -98,7 +100,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
new file mode 100644
index 000000000..3e6904d38
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
@@ -0,0 +1,129 @@
+    Info<< "Reading field p\n" << endl;
+    volScalarField p
+    (
+        IOobject
+        (
+            "p",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    Info<< "Reading field alpha1\n" << endl;
+    volScalarField alpha1
+    (
+        IOobject
+        (
+            "alpha1",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    Info<< "Calculating field alpha1\n" << endl;
+    volScalarField alpha2("alpha2", scalar(1) - alpha1);
+
+    Info<< "Reading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    #include "createPhi.H"
+
+
+    Info<< "Reading transportProperties\n" << endl;
+    twoPhaseMixture twoPhaseProperties(U, phi);
+
+    dimensionedScalar rho10
+    (
+        twoPhaseProperties.subDict
+        (
+            twoPhaseProperties.phase1Name()
+        ).lookup("rho0")
+    );
+
+    dimensionedScalar rho20
+    (
+        twoPhaseProperties.subDict
+        (
+            twoPhaseProperties.phase2Name()
+        ).lookup("rho0")
+    );
+
+    dimensionedScalar psi1
+    (
+        twoPhaseProperties.subDict
+        (
+            twoPhaseProperties.phase1Name()
+        ).lookup("psi")
+    );
+
+    dimensionedScalar psi2
+    (
+        twoPhaseProperties.subDict
+        (
+            twoPhaseProperties.phase2Name()
+        ).lookup("psi")
+    );
+
+    dimensionedScalar pMin(twoPhaseProperties.lookup("pMin"));
+
+    volScalarField rho1 = rho10 + psi1*p;
+    volScalarField rho2 = rho20 + psi2*p;
+
+    volScalarField rho
+    (
+        IOobject
+        (
+            "rho",
+            runTime.timeName(),
+            mesh,
+            IOobject::READ_IF_PRESENT,
+            IOobject::AUTO_WRITE
+        ),
+        alpha1*rho1 + alpha2*rho2
+    );
+
+
+    // Mass flux
+    // Initialisation does not matter because rhoPhi is reset after the
+    // alpha1 solution before it is used in the U equation.
+    surfaceScalarField rhoPhi
+    (
+        IOobject
+        (
+            "rho*phi",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        fvc::interpolate(rho)*phi
+    );
+
+    volScalarField dgdt =
+        pos(alpha2)*fvc::div(phi)/max(alpha2, scalar(0.0001));
+
+    // Construct interface from alpha1 distribution
+    interfaceProperties interface(alpha1, U, twoPhaseProperties);
+
+    // Construct incompressible turbulence model
+    autoPtr<incompressible::turbulenceModel> turbulence
+    (
+        incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
+    );
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
similarity index 60%
rename from applications/solvers/multiphase/compressibleLesInterFoam/pEqn.H
rename to applications/solvers/multiphase/compressibleInterFoam/pEqn.H
index ebf24498a..9d2dc2391 100644
--- a/applications/solvers/multiphase/compressibleLesInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -2,17 +2,17 @@
     volScalarField rUA = 1.0/UEqn.A();
     surfaceScalarField rUAf = fvc::interpolate(rUA);
 
-    tmp<fvScalarMatrix> pdEqnComp;
+    tmp<fvScalarMatrix> pEqnComp;
 
     if (transonic)
     {
-        pdEqnComp =
-            (fvm::ddt(pd) + fvm::div(phi, pd) - fvm::Sp(fvc::div(phi), pd));
+        pEqnComp =
+            (fvm::ddt(p) + fvm::div(phi, p) - fvm::Sp(fvc::div(phi), p));
     }
     else
     {
-        pdEqnComp =
-            (fvm::ddt(pd) + fvc::div(phi, pd) - fvc::Sp(fvc::div(phi), pd));
+        pEqnComp =
+            (fvm::ddt(p) + fvc::div(phi, p) - fvc::Sp(fvc::div(phi), p));
     }
 
 
@@ -26,16 +26,16 @@
 
     phi = phiU +
         (
-            fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
-          - ghf*fvc::snGrad(rho)
-        )*rUAf*mesh.magSf();
+            fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)*mesh.magSf()
+          + fvc::interpolate(rho)*(g & mesh.Sf())
+        )*rUAf;
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
-        fvScalarMatrix pdEqnIncomp
+        fvScalarMatrix pEqnIncomp
         (
             fvc::div(phi)
-          - fvm::laplacian(rUAf, pd)
+          - fvm::laplacian(rUAf, p)
         );
 
         solve
@@ -44,31 +44,27 @@
                 max(alpha1, scalar(0))*(psi1/rho1)
               + max(alpha2, scalar(0))*(psi2/rho2)
             )
-           *pdEqnComp()
-          + pdEqnIncomp
+           *pEqnComp()
+          + pEqnIncomp
         );
 
         if (nonOrth == nNonOrthCorr)
         {
             dgdt =
                 (pos(alpha2)*(psi2/rho2) - pos(alpha1)*(psi1/rho1))
-               *(pdEqnComp & pd);
-            phi += pdEqnIncomp.flux();
+               *(pEqnComp & p);
+            phi += pEqnIncomp.flux();
         }
     }
 
     U += rUA*fvc::reconstruct((phi - phiU)/rUAf);
     U.correctBoundaryConditions();
 
-    p = max
-        (
-            (pd + gh*(alpha1*rho10 + alpha2*rho20))/(1.0 - gh*(alpha1*psi1 + alpha2*psi2)),
-            pMin
-        );
+    p.max(pMin);
 
     rho1 = rho10 + psi1*p;
     rho2 = rho20 + psi2*p;
 
     Info<< "max(U) " << max(mag(U)).value() << endl;
-    Info<< "min(pd) " << min(pd).value() << endl;
+    Info<< "min(p) " << min(p).value() << endl;
 }
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/readControls.H b/applications/solvers/multiphase/compressibleInterFoam/readControls.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleLesInterFoam/readControls.H
rename to applications/solvers/multiphase/compressibleInterFoam/readControls.H
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/Make/files b/applications/solvers/multiphase/compressibleLesInterFoam/Make/files
deleted file mode 100644
index 05dafae8b..000000000
--- a/applications/solvers/multiphase/compressibleLesInterFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-compressibleLesInterFoam.C
-
-EXE = $(FOAM_APPBIN)/compressibleLesInterFoam
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/UEqn.H b/applications/solvers/multiphase/compressibleLesInterFoam/UEqn.H
deleted file mode 100644
index 089591736..000000000
--- a/applications/solvers/multiphase/compressibleLesInterFoam/UEqn.H
+++ /dev/null
@@ -1,29 +0,0 @@
-    surfaceScalarField muf =
-        twoPhaseProperties.muf()
-      + fvc::interpolate(rho*turbulence->nuSgs());
-
-    fvVectorMatrix UEqn
-    (
-        fvm::ddt(rho, U)
-      + fvm::div(rhoPhi, U)
-      - fvm::laplacian(muf, U)
-      - (fvc::grad(U) & fvc::grad(muf))
-    //- fvc::div(muf*(mesh.Sf() & fvc::interpolate(fvc::grad(U)().T())))
-    );
-
-    if (momentumPredictor)
-    {
-        solve
-        (
-            UEqn
-         ==
-            fvc::reconstruct
-            (
-                (
-                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
-                  - ghf*fvc::snGrad(rho)
-                  - fvc::snGrad(pd)
-                ) * mesh.magSf()
-            )
-        );
-    }
diff --git a/applications/solvers/multiphase/interDyMFoam/Make/options b/applications/solvers/multiphase/interDyMFoam/Make/options
index 48a32a49d..39b00bbd9 100644
--- a/applications/solvers/multiphase/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interDyMFoam/Make/options
@@ -1,9 +1,9 @@
 EXE_INC = \
+    -I../interFoam \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
-    -I$(LIB_SRC)/turbulenceModels/RAS/incompressible/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -13,8 +13,10 @@ EXE_LIBS = \
     -linterfaceProperties \
     -lincompressibleTransportModels \
     -lincompressibleRASModels \
+    -lincompressibleLESModels \
     -lfiniteVolume \
     -ldynamicMesh \
     -lmeshTools \
-    -ldynamicFvMesh
-
+    -ldynamicFvMesh \
+    -ltopoChangerFvMesh \
+    -llduSolvers
diff --git a/applications/solvers/multiphase/interDyMFoam/UEqn.H b/applications/solvers/multiphase/interDyMFoam/UEqn.H
deleted file mode 100644
index 7e4a29468..000000000
--- a/applications/solvers/multiphase/interDyMFoam/UEqn.H
+++ /dev/null
@@ -1,29 +0,0 @@
-    surfaceScalarField muf = twoPhaseProperties.muf();
-
-    fvVectorMatrix UEqn
-    (
-        fvm::ddt(rho, U)
-      + fvm::div(rhoPhi, U)
-      - fvm::laplacian(muf, U)
-      - (fvc::grad(U) & fvc::grad(muf))
-    //- fvc::div(muf*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
-    );
-
-    UEqn.relax();
-
-    if (momentumPredictor)
-    {
-        solve
-        (
-            UEqn
-         ==
-            fvc::reconstruct
-            (
-                (
-                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
-                  - ghf*fvc::snGrad(rho)
-                  - fvc::snGrad(pd)
-                ) * mesh.magSf()
-            )
-        );
-    }
diff --git a/applications/solvers/multiphase/interDyMFoam/correctPhi.H b/applications/solvers/multiphase/interDyMFoam/correctPhi.H
index c975c9b37..88472df9b 100644
--- a/applications/solvers/multiphase/interDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interDyMFoam/correctPhi.H
@@ -1,4 +1,26 @@
 {
+    if (mesh.changing())
+    {
+        forAll(U.boundaryField(), patchi)
+        {
+            if (U.boundaryField()[patchi].fixesValue())
+            {
+                U.boundaryField()[patchi].initEvaluate();
+            }
+        }
+
+        forAll(U.boundaryField(), patchi)
+        {
+            if (U.boundaryField()[patchi].fixesValue())
+            {
+                U.boundaryField()[patchi].evaluate();
+
+                phi.boundaryField()[patchi] =
+                U.boundaryField()[patchi] & mesh.Sf().boundaryField()[patchi];
+            }
+        }
+    }
+
 #   include "continuityErrs.H"
 
     volScalarField pcorr
diff --git a/applications/solvers/multiphase/interDyMFoam/createFields.H b/applications/solvers/multiphase/interDyMFoam/createFields.H
index c2b7ee49e..afadd3666 100644
--- a/applications/solvers/multiphase/interDyMFoam/createFields.H
+++ b/applications/solvers/multiphase/interDyMFoam/createFields.H
@@ -12,12 +12,12 @@
         mesh
     );
 
-    Info<< "Reading field gamma\n" << endl;
-    volScalarField gamma
+    Info<< "Reading field alpha1\n" << endl;
+    volScalarField alpha1
     (
         IOobject
         (
-            "gamma",
+            "alpha1",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -44,7 +44,7 @@
 
 
     Info<< "Reading transportProperties\n" << endl;
-    twoPhaseMixture twoPhaseProperties(U, phi, "gamma");
+    twoPhaseMixture twoPhaseProperties(U, phi, "alpha1");
 
     const dimensionedScalar& rho1 = twoPhaseProperties.rho1();
     const dimensionedScalar& rho2 = twoPhaseProperties.rho2();
@@ -60,15 +60,15 @@
             mesh,
             IOobject::READ_IF_PRESENT
         ),
-        gamma*rho1 + (scalar(1) - gamma)*rho2,
-        gamma.boundaryField().types()
+        alpha1*rho1 + (scalar(1) - alpha1)*rho2,
+        alpha1.boundaryField().types()
     );
     rho.oldTime();
 
 
     // Mass flux
     // Initialisation does not matter because rhoPhi is reset after the
-    // gamma solution before it is used in the U equation.
+    // alpha1 solution before it is used in the U equation.
     surfaceScalarField rhoPhi
     (
         IOobject
@@ -83,18 +83,22 @@
     );
 
 
-    // Construct interface from gamma distribution
-    interfaceProperties interface(gamma, U, twoPhaseProperties);
+    // Construct interface from alpha1 distribution
+    interfaceProperties interface(alpha1, U, twoPhaseProperties);
 
-    // Construct incompressible RAS model
-    autoPtr<incompressible::RASModel> turbulence
+    // Construct incompressible turbulence model
+    autoPtr<incompressible::turbulenceModel> turbulence
     (
-        incompressible::RASModel::New(U, phi, twoPhaseProperties)
+        incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
     );
 
-    wordList pcorrTypes(pd.boundaryField().types());
+    wordList pcorrTypes
+    (
+        pd.boundaryField().size(),
+        zeroGradientFvPatchScalarField::typeName
+    );
 
-    for (label i=0; i<pd.boundaryField().size(); i++)
+    for (label i = 0; i < pd.boundaryField().size(); i++)
     {
         if (pd.boundaryField()[i].fixesValue())
         {
diff --git a/applications/solvers/multiphase/interDyMFoam/gammaEqn.H b/applications/solvers/multiphase/interDyMFoam/gammaEqn.H
deleted file mode 100644
index 8978d1d29..000000000
--- a/applications/solvers/multiphase/interDyMFoam/gammaEqn.H
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    word gammaScheme("div(phi,gamma)");
-    word gammarScheme("div(phirb,gamma)");
-
-    surfaceScalarField phic = mag(phi/mesh.magSf());
-    phic = min(interface.cGamma()*phic, max(phic));
-    surfaceScalarField phir = phic*interface.nHatf();
-
-    for (int gCorr=0; gCorr<nGammaCorr; gCorr++)
-    {
-        surfaceScalarField phiGamma = 
-            fvc::flux
-            (
-                phi,
-                gamma,
-                gammaScheme
-            )
-          + fvc::flux
-            (
-                -fvc::flux(-phir, scalar(1) - gamma, gammarScheme),
-                gamma,
-                gammarScheme
-            );
-
-        MULES::explicitSolve(gamma, phi, phiGamma, 1, 0);
-
-        rhoPhi = phiGamma*(rho1 - rho2) + phi*rho2;
-    }
-
-    Info<< "Liquid phase volume fraction = "
-        << gamma.weightedAverage(mesh.V()).value()
-        << "  Min(gamma) = " << min(gamma).value()
-        << "  Max(gamma) = " << max(gamma).value()
-        << endl;
-}
diff --git a/applications/solvers/multiphase/interDyMFoam/gammaEqnSubCycle.H b/applications/solvers/multiphase/interDyMFoam/gammaEqnSubCycle.H
deleted file mode 100644
index f762bac8c..000000000
--- a/applications/solvers/multiphase/interDyMFoam/gammaEqnSubCycle.H
+++ /dev/null
@@ -1,35 +0,0 @@
-label nGammaCorr
-(
-    readLabel(piso.lookup("nGammaCorr"))
-);
-
-label nGammaSubCycles
-(
-    readLabel(piso.lookup("nGammaSubCycles"))
-);
-
-if (nGammaSubCycles > 1)
-{
-    dimensionedScalar totalDeltaT = runTime.deltaT();
-    surfaceScalarField rhoPhiSum = 0.0*rhoPhi;
-
-    for
-    (
-        subCycle<volScalarField> gammaSubCycle(gamma, nGammaSubCycles);
-        !(++gammaSubCycle).end();
-    )
-    {
-#       include "gammaEqn.H"
-        rhoPhiSum += (runTime.deltaT()/totalDeltaT)*rhoPhi;
-    }
-
-    rhoPhi = rhoPhiSum;
-}
-else
-{
-#       include "gammaEqn.H"
-}
-
-interface.correct();
-
-rho == gamma*rho1 + (scalar(1) - gamma)*rho2;
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index 48f7be461..285059a8c 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -39,8 +39,7 @@ Description
 #include "subCycle.H"
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
-#include "incompressible/RASModel/RASModel.H"
-#include "EulerDdtScheme.H"
+#include "turbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,7 +48,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
@@ -106,7 +105,7 @@ int main(int argc, char *argv[])
 
         twoPhaseProperties.correct();
 
-        #include "gammaEqnSubCycle.H"
+        #include "alphaEqnSubCycle.H"
 
         #include "UEqn.H"
 
@@ -139,7 +138,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interDyMFoam/pEqn.H
index 73c53b570..bda17ff52 100644
--- a/applications/solvers/multiphase/interDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interDyMFoam/pEqn.H
@@ -5,17 +5,18 @@
     U = rAU*UEqn.H();
     surfaceScalarField phiU("phiU", (fvc::interpolate(U) & mesh.Sf()));
 
-    phi = phiU +
-    (
-        fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
-      - ghf*fvc::snGrad(rho)
-    )*rAUf*mesh.magSf();
-
     if (pd.needReference())
     {
         adjustPhi(phi, U, pd);
     }
 
+    phi = phiU +
+    (
+        fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
+      - ghf*fvc::snGrad(rho)
+    )*rAUf*mesh.magSf();
+
+
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pdEqn
diff --git a/applications/solvers/multiphase/interFoam/Make/options b/applications/solvers/multiphase/interFoam/Make/options
index 376c09beb..cda832118 100644
--- a/applications/solvers/multiphase/interFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/Make/options
@@ -2,10 +2,13 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -linterfaceProperties \
     -lincompressibleTransportModels \
+    -lincompressibleRASModels \
+    -lincompressibleLESModels \
     -lfiniteVolume \
     -llduSolvers
diff --git a/applications/solvers/multiphase/interFoam/UBlendingFactor.H b/applications/solvers/multiphase/interFoam/UBlendingFactor.H
deleted file mode 100644
index 217a9c397..000000000
--- a/applications/solvers/multiphase/interFoam/UBlendingFactor.H
+++ /dev/null
@@ -1,6 +0,0 @@
-    surfaceScalarField gammaf = fvc::interpolate(gamma);
-    surfaceScalarField UBlendingFactor
-    (
-        "UBlendingFactor",
-        sqrt(max(min(4*gammaf*(1.0 - gammaf), 1.0), 0.0))
-    );
diff --git a/applications/solvers/multiphase/interFoam/UEqn.H b/applications/solvers/multiphase/interFoam/UEqn.H
index 7e4a29468..528e0aaaf 100644
--- a/applications/solvers/multiphase/interFoam/UEqn.H
+++ b/applications/solvers/multiphase/interFoam/UEqn.H
@@ -1,12 +1,17 @@
-    surfaceScalarField muf = twoPhaseProperties.muf();
+    surfaceScalarField muEff
+    (
+        "muEff",
+        twoPhaseProperties.muf()
+      + fvc::interpolate(rho*turbulence->nut())
+    );
 
     fvVectorMatrix UEqn
     (
         fvm::ddt(rho, U)
       + fvm::div(rhoPhi, U)
-      - fvm::laplacian(muf, U)
-      - (fvc::grad(U) & fvc::grad(muf))
-    //- fvc::div(muf*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
+      - fvm::laplacian(muEff, U)
+      - (fvc::grad(U) & fvc::grad(muEff))
+    //- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
     );
 
     UEqn.relax();
@@ -20,7 +25,7 @@
             fvc::reconstruct
             (
                 (
-                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
+                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
                   - ghf*fvc::snGrad(rho)
                   - fvc::snGrad(pd)
                 ) * mesh.magSf()
diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H
new file mode 100644
index 000000000..0b2fb4ebf
--- /dev/null
+++ b/applications/solvers/multiphase/interFoam/alphaEqn.H
@@ -0,0 +1,35 @@
+{
+    word alphaScheme("div(phi,alpha)");
+    word alpharScheme("div(phirb,alpha)");
+
+    surfaceScalarField phic = mag(phi/mesh.magSf());
+    phic = min(interface.cAlpha()*phic, max(phic));
+    surfaceScalarField phir = phic*interface.nHatf();
+
+    for (int aCorr=0; aCorr<nAlphaCorr; aCorr++)
+    {
+        surfaceScalarField phiAlpha =
+            fvc::flux
+            (
+                phi,
+                alpha1,
+                alphaScheme
+            )
+          + fvc::flux
+            (
+                -fvc::flux(-phir, scalar(1) - alpha1, alpharScheme),
+                alpha1,
+                alpharScheme
+            );
+
+        MULES::explicitSolve(alpha1, phi, phiAlpha, 1, 0);
+
+        rhoPhi = phiAlpha*(rho1 - rho2) + phi*rho2;
+    }
+
+    Info<< "Liquid phase volume fraction = "
+        << alpha1.weightedAverage(mesh.V()).value()
+        << "  Min(alpha1) = " << min(alpha1).value()
+        << "  Max(alpha1) = " << max(alpha1).value()
+        << endl;
+}
diff --git a/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
new file mode 100644
index 000000000..9aae37a8b
--- /dev/null
+++ b/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
@@ -0,0 +1,35 @@
+label nAlphaCorr
+(
+    readLabel(piso.lookup("nAlphaCorr"))
+);
+
+label nAlphaSubCycles
+(
+    readLabel(piso.lookup("nAlphaSubCycles"))
+);
+
+if (nAlphaSubCycles > 1)
+{
+    dimensionedScalar totalDeltaT = runTime.deltaT();
+    surfaceScalarField rhoPhiSum = 0.0*rhoPhi;
+
+    for
+    (
+        subCycle<volScalarField> alphaSubCycle(alpha1, nAlphaSubCycles);
+        !(++alphaSubCycle).end();
+    )
+    {
+#       include "alphaEqn.H"
+        rhoPhiSum += (runTime.deltaT()/totalDeltaT)*rhoPhi;
+    }
+
+    rhoPhi = rhoPhiSum;
+}
+else
+{
+#       include "alphaEqn.H"
+}
+
+interface.correct();
+
+rho == alpha1*rho1 + (scalar(1) - alpha1)*rho2;
diff --git a/applications/solvers/multiphase/interFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/correctPhi.H
index 171e1670f..ed5ccc9a7 100644
--- a/applications/solvers/multiphase/interFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/correctPhi.H
@@ -1,7 +1,11 @@
 {
 #   include "continuityErrs.H"
 
-    wordList pcorrTypes(pd.boundaryField().types());
+    wordList pcorrTypes
+    (
+        pd.boundaryField().size(),
+        zeroGradientFvPatchScalarField::typeName
+    );
 
     for (label i=0; i<pd.boundaryField().size(); i++)
     {
diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H
index 284e3edf1..4a0e02486 100644
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@@ -12,12 +12,12 @@
         mesh
     );
 
-    Info<< "Reading field gamma\n" << endl;
-    volScalarField gamma
+    Info<< "Reading field alpha1\n" << endl;
+    volScalarField alpha1
     (
         IOobject
         (
-            "gamma",
+            "alpha1",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -44,7 +44,7 @@
 
 
     Info<< "Reading transportProperties\n" << endl;
-    twoPhaseMixture twoPhaseProperties(U, phi, "gamma");
+    twoPhaseMixture twoPhaseProperties(U, phi, "alpha1");
 
     const dimensionedScalar& rho1 = twoPhaseProperties.rho1();
     const dimensionedScalar& rho2 = twoPhaseProperties.rho2();
@@ -60,15 +60,15 @@
             mesh,
             IOobject::READ_IF_PRESENT
         ),
-        gamma*rho1 + (scalar(1) - gamma)*rho2,
-        gamma.boundaryField().types()
+        alpha1*rho1 + (scalar(1) - alpha1)*rho2,
+        alpha1.boundaryField().types()
     );
     rho.oldTime();
 
 
     // Mass flux
     // Initialisation does not matter because rhoPhi is reset after the
-    // gamma solution before it is used in the U equation.
+    // alpha1 solution before it is used in the U equation.
     surfaceScalarField rhoPhi
     (
         IOobject
@@ -87,7 +87,6 @@
     volScalarField gh("gh", g & mesh.C());
     surfaceScalarField ghf("gh", g & mesh.Cf());
 
-
     volScalarField p
     (
         IOobject
@@ -123,5 +122,11 @@
         );
     }
 
-    // Construct interface from gamma distribution
-    interfaceProperties interface(gamma, U, twoPhaseProperties);
+    // Construct interface from alpha1 distribution
+    interfaceProperties interface(alpha1, U, twoPhaseProperties);
+
+     // Construct incompressible turbulence model
+    autoPtr<incompressible::turbulenceModel> turbulence
+    (
+        incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
+    );
diff --git a/applications/solvers/multiphase/interFoam/gammaEqn.H b/applications/solvers/multiphase/interFoam/gammaEqn.H
deleted file mode 100644
index 8978d1d29..000000000
--- a/applications/solvers/multiphase/interFoam/gammaEqn.H
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    word gammaScheme("div(phi,gamma)");
-    word gammarScheme("div(phirb,gamma)");
-
-    surfaceScalarField phic = mag(phi/mesh.magSf());
-    phic = min(interface.cGamma()*phic, max(phic));
-    surfaceScalarField phir = phic*interface.nHatf();
-
-    for (int gCorr=0; gCorr<nGammaCorr; gCorr++)
-    {
-        surfaceScalarField phiGamma = 
-            fvc::flux
-            (
-                phi,
-                gamma,
-                gammaScheme
-            )
-          + fvc::flux
-            (
-                -fvc::flux(-phir, scalar(1) - gamma, gammarScheme),
-                gamma,
-                gammarScheme
-            );
-
-        MULES::explicitSolve(gamma, phi, phiGamma, 1, 0);
-
-        rhoPhi = phiGamma*(rho1 - rho2) + phi*rho2;
-    }
-
-    Info<< "Liquid phase volume fraction = "
-        << gamma.weightedAverage(mesh.V()).value()
-        << "  Min(gamma) = " << min(gamma).value()
-        << "  Max(gamma) = " << max(gamma).value()
-        << endl;
-}
diff --git a/applications/solvers/multiphase/interFoam/gammaEqnSubCycle.H b/applications/solvers/multiphase/interFoam/gammaEqnSubCycle.H
deleted file mode 100644
index f762bac8c..000000000
--- a/applications/solvers/multiphase/interFoam/gammaEqnSubCycle.H
+++ /dev/null
@@ -1,35 +0,0 @@
-label nGammaCorr
-(
-    readLabel(piso.lookup("nGammaCorr"))
-);
-
-label nGammaSubCycles
-(
-    readLabel(piso.lookup("nGammaSubCycles"))
-);
-
-if (nGammaSubCycles > 1)
-{
-    dimensionedScalar totalDeltaT = runTime.deltaT();
-    surfaceScalarField rhoPhiSum = 0.0*rhoPhi;
-
-    for
-    (
-        subCycle<volScalarField> gammaSubCycle(gamma, nGammaSubCycles);
-        !(++gammaSubCycle).end();
-    )
-    {
-#       include "gammaEqn.H"
-        rhoPhiSum += (runTime.deltaT()/totalDeltaT)*rhoPhi;
-    }
-
-    rhoPhi = rhoPhiSum;
-}
-else
-{
-#       include "gammaEqn.H"
-}
-
-interface.correct();
-
-rho == gamma*rho1 + (scalar(1) - gamma)*rho2;
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index 8f30c061c..16e4b0558 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -28,9 +28,12 @@ Application
 Description
     Solver for 2 incompressible, isothermal immiscible fluids using a VOF
     (volume of fluid) phase-fraction based interface capturing approach.
+
     The momentum and other fluid properties are of the "mixture" and a single
     momentum equation is solved.
 
+    Turbulence modelling is generic, i.e.  laminar, RAS or LES may be selected.
+
     For a two-fluid approach see twoPhaseEulerFoam.
 
 \*---------------------------------------------------------------------------*/
@@ -40,6 +43,7 @@ Description
 #include "subCycle.H"
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
+#include "turbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,7 +52,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
@@ -74,7 +78,7 @@ int main(int argc, char *argv[])
 
         twoPhaseProperties.correct();
 
-        #include "gammaEqnSubCycle.H"
+        #include "alphaEqnSubCycle.H"
 
         #include "UEqn.H"
 
@@ -107,7 +111,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/interFoam/pEqn.H b/applications/solvers/multiphase/interFoam/pEqn.H
index 77256a8e2..e93021a46 100644
--- a/applications/solvers/multiphase/interFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/pEqn.H
@@ -7,16 +7,18 @@
     surfaceScalarField phiU
     (
         "phiU",
-        (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi)
+        (fvc::interpolate(U) & mesh.Sf())
+      + fvc::ddtPhiCorr(rUA, rho, U, phi)
     );
 
+    adjustPhi(phiU, U, p);
+
     phi = phiU +
         (
-            fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
+            fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
           - ghf*fvc::snGrad(rho)
         )*rUAf*mesh.magSf();
 
-    adjustPhi(phi, U, pd);
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/multiphase/interMixingFoam/Make/files b/applications/solvers/multiphase/interMixingFoam/Make/files
new file mode 100644
index 000000000..488cd77e5
--- /dev/null
+++ b/applications/solvers/multiphase/interMixingFoam/Make/files
@@ -0,0 +1,6 @@
+incompressibleThreePhaseMixture/threePhaseMixture.C
+threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
+interMixingFoam.C
+
+EXE = $(FOAM_APPBIN)/interMixingFoam
+
diff --git a/applications/solvers/multiphase/interMixingFoam/Make/options b/applications/solvers/multiphase/interMixingFoam/Make/options
new file mode 100644
index 000000000..d8e4da231
--- /dev/null
+++ b/applications/solvers/multiphase/interMixingFoam/Make/options
@@ -0,0 +1,17 @@
+INTERFOAM = $(FOAM_SOLVERS)/multiphase/interFoam
+
+EXE_INC = \
+    -I$(INTERFOAM) \
+    -IincompressibleThreePhaseMixture \
+    -IthreePhaseInterfaceProperties \
+    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/transportModels
+
+EXE_LIBS = \
+    -linterfaceProperties \
+    -lincompressibleTransportModels \
+    -lincompressibleRASModels \
+    -lincompressibleLESModels \
+    -lfiniteVolume
diff --git a/applications/solvers/multiphase/interMixingFoam/alphaEqns.H b/applications/solvers/multiphase/interMixingFoam/alphaEqns.H
new file mode 100644
index 000000000..1fc545d45
--- /dev/null
+++ b/applications/solvers/multiphase/interMixingFoam/alphaEqns.H
@@ -0,0 +1,164 @@
+{
+    word alphaScheme("div(phi,alpha)");
+    word alpharScheme("div(phirb,alpha)");
+
+    surfaceScalarField phir
+    (
+        IOobject
+        (
+            "phir",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        interface.cAlpha()*mag(phi/mesh.magSf())*interface.nHatf()
+    );
+
+    for (int gCorr=0; gCorr<nAlphaCorr; gCorr++)
+    {
+        // Create the limiter to be used for all phase-fractions
+        scalarField allLambda(mesh.nFaces(), 1.0);
+
+        // Split the limiter into a surfaceScalarField
+        slicedSurfaceScalarField lambda
+        (
+            IOobject
+            (
+                "lambda",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            mesh,
+            dimless,
+            allLambda
+        );
+
+
+        // Create the complete convection flux for alpha1
+        surfaceScalarField phiAlpha1 =
+            fvc::flux
+            (
+                phi,
+                alpha1,
+                alphaScheme
+            )
+          + fvc::flux
+            (
+                -fvc::flux(-phir, alpha2, alpharScheme),
+                alpha1,
+                alpharScheme
+            )
+          + fvc::flux
+            (
+                -fvc::flux(-phir, alpha3, alpharScheme),
+                alpha1,
+                alpharScheme
+            );
+
+        // Create the bounded (upwind) flux for alpha1
+        surfaceScalarField phiAlpha1BD =
+            upwind<scalar>(mesh, phi).flux(alpha1);
+
+        // Calculate the flux correction for alpha1
+        phiAlpha1 -= phiAlpha1BD;
+
+        // Calculate the limiter for alpha1
+        MULES::limiter
+        (
+            allLambda,
+            geometricOneField(),
+            alpha1,
+            phiAlpha1BD,
+            phiAlpha1,
+            zeroField(),
+            zeroField(),
+            1,
+            0,
+            3
+        );
+
+        // Create the complete flux for alpha2
+        surfaceScalarField phiAlpha2 =
+            fvc::flux
+            (
+                phi,
+                alpha2,
+                alphaScheme
+            )
+          + fvc::flux
+            (
+                -fvc::flux(phir, alpha1, alpharScheme),
+                alpha2,
+                alpharScheme
+            );
+
+        // Create the bounded (upwind) flux for alpha2
+        surfaceScalarField phiAlpha2BD =
+            upwind<scalar>(mesh, phi).flux(alpha2);
+
+        // Calculate the flux correction for alpha2
+        phiAlpha2 -= phiAlpha2BD;
+
+        // Further limit the limiter for alpha2
+        MULES::limiter
+        (
+            allLambda,
+            geometricOneField(),
+            alpha2,
+            phiAlpha2BD,
+            phiAlpha2,
+            zeroField(),
+            zeroField(),
+            1,
+            0,
+            3
+        );
+
+        // Construct the limited fluxes
+        phiAlpha1 = phiAlpha1BD + lambda*phiAlpha1;
+        phiAlpha2 = phiAlpha2BD + lambda*phiAlpha2;
+
+        // Solve for alpha1
+        solve(fvm::ddt(alpha1) + fvc::div(phiAlpha1));
+
+        // Create the diffusion coefficients for alpha2<->alpha3
+        volScalarField Dc23 = D23*max(alpha3, scalar(0))*pos(alpha2);
+        volScalarField Dc32 = D23*max(alpha2, scalar(0))*pos(alpha3);
+
+        // Add the diffusive flux for alpha3->alpha2
+        phiAlpha2 -= fvc::interpolate(Dc32)*mesh.magSf()*fvc::snGrad(alpha1);
+
+        // Solve for alpha2
+        fvScalarMatrix alpha2Eqn
+        (
+            fvm::ddt(alpha2)
+          + fvc::div(phiAlpha2)
+          - fvm::laplacian(Dc23 + Dc32, alpha2)
+        );
+        alpha2Eqn.solve();
+
+        // Construct the complete mass flux
+        rhoPhi =
+              phiAlpha1*(rho1 - rho3)
+            + (phiAlpha2 + alpha2Eqn.flux())*(rho2 - rho3)
+            + phi*rho3;
+
+        alpha3 = 1.0 - alpha1 - alpha2;
+    }
+
+    Info<< "Air phase volume fraction = "
+        << alpha1.weightedAverage(mesh.V()).value()
+        << "  Min(alpha1) = " << min(alpha1).value()
+        << "  Max(alpha1) = " << max(alpha1).value()
+        << endl;
+
+    Info<< "Liquid phase volume fraction = "
+        << alpha2.weightedAverage(mesh.V()).value()
+        << "  Min(alpha2) = " << min(alpha2).value()
+        << "  Max(alpha2) = " << max(alpha2).value()
+        << endl;
+}
diff --git a/applications/solvers/multiphase/interMixingFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/interMixingFoam/alphaEqnsSubCycle.H
new file mode 100644
index 000000000..765087a18
--- /dev/null
+++ b/applications/solvers/multiphase/interMixingFoam/alphaEqnsSubCycle.H
@@ -0,0 +1,43 @@
+label nAlphaCorr
+(
+    readLabel(piso.lookup("nAlphaCorr"))
+);
+
+label nAlphaSubCycles
+(
+    readLabel(piso.lookup("nAlphaSubCycles"))
+);
+
+if (nAlphaSubCycles > 1)
+{
+    surfaceScalarField rhoPhiSum = 0.0*rhoPhi;
+    dimensionedScalar totalDeltaT = runTime.deltaT();
+
+    for
+    (
+        subCycle<volScalarField> alphaSubCycle(alpha1, nAlphaSubCycles);
+        !(++alphaSubCycle).end();
+    )
+    {
+#       include "alphaEqns.H"
+        rhoPhiSum += (runTime.deltaT()/totalDeltaT)*rhoPhi;
+    }
+
+    rhoPhi = rhoPhiSum;
+}
+else
+{
+#       include "alphaEqns.H"
+}
+
+interface.correct();
+
+{
+    volScalarField rhoNew = alpha1*rho1 + alpha2*rho2 + alpha3*rho3;
+
+    //solve(fvm::ddt(rho) + fvc::div(rhoPhi));
+    //Info<< "density error = "
+    //    << max((mag(rho - rhoNew)/mag(rhoNew))().internalField()) << endl;
+
+    rho == rhoNew;
+}
diff --git a/applications/solvers/multiphase/lesInterFoam/createFields.H b/applications/solvers/multiphase/interMixingFoam/createFields.H
similarity index 58%
rename from applications/solvers/multiphase/lesInterFoam/createFields.H
rename to applications/solvers/multiphase/interMixingFoam/createFields.H
index 2b858bd30..6fdd34175 100644
--- a/applications/solvers/multiphase/lesInterFoam/createFields.H
+++ b/applications/solvers/multiphase/interMixingFoam/createFields.H
@@ -1,4 +1,4 @@
-    Info<< "Reading field pd\n" << endl;
+    Info<< "Reading field p\n" << endl;
     volScalarField pd
     (
         IOobject
@@ -12,12 +12,12 @@
         mesh
     );
 
-    Info<< "Reading field gamma\n" << endl;
-    volScalarField gamma
+    Info<< "Reading field alpha1\n" << endl;
+    volScalarField alpha1
     (
         IOobject
         (
-            "gamma",
+            "alpha1",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -26,6 +26,39 @@
         mesh
     );
 
+
+    Info<< "Reading field alpha2\n" << endl;
+    volScalarField alpha2
+    (
+        IOobject
+        (
+            "alpha2",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+
+    Info<< "Reading field alpha3\n" << endl;
+    volScalarField alpha3
+    (
+        IOobject
+        (
+            "alpha3",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    alpha3 == 1.0 - alpha1 - alpha2;
+
+
     Info<< "Reading field U\n" << endl;
     volVectorField U
     (
@@ -42,12 +75,13 @@
 
 #   include "createPhi.H"
 
-    Info<< "Reading transportProperties\n" << endl;
-    twoPhaseMixture twoPhaseProperties(U, phi, "gamma");
+    threePhaseMixture threePhaseProperties(U, phi);
 
-    const dimensionedScalar& rho1 = twoPhaseProperties.rho1();
-    const dimensionedScalar& rho2 = twoPhaseProperties.rho2();
+    const dimensionedScalar& rho1 = threePhaseProperties.rho1();
+    const dimensionedScalar& rho2 = threePhaseProperties.rho2();
+    const dimensionedScalar& rho3 = threePhaseProperties.rho3();
 
+    dimensionedScalar D23(threePhaseProperties.lookup("D23"));
 
     // Need to store rho for ddt(rho, U)
     volScalarField rho
@@ -59,14 +93,15 @@
             mesh,
             IOobject::READ_IF_PRESENT
         ),
-        gamma*rho1 + (scalar(1) - gamma)*rho2,
-        gamma.boundaryField().types()
+        alpha1*rho1 + alpha2*rho2 + alpha3*rho3,
+        alpha1.boundaryField().types()
     );
     rho.oldTime();
 
+
     // Mass flux
     // Initialisation does not matter because rhoPhi is reset after the
-    // gamma solution before it is used in the U equation.
+    // alpha solution before it is used in the U equation.
     surfaceScalarField rhoPhi
     (
         IOobject
@@ -80,7 +115,6 @@
         rho1*phi
     );
 
-
     Info<< "Calculating field g.h\n" << endl;
     volScalarField gh("gh", g & mesh.C());
     surfaceScalarField ghf("gh", g & mesh.Cf());
@@ -99,7 +133,6 @@
         pd + rho*gh
     );
 
-
     label pdRefCell = 0;
     scalar pdRefValue = 0.0;
     setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
@@ -121,11 +154,12 @@
         );
     }
 
-    // Construct interface from gamma distribution
-    interfaceProperties interface(gamma, U, twoPhaseProperties);
+    // Construct interface from alpha distribution
+    threePhaseInterfaceProperties interface(threePhaseProperties);
 
-    // Construct LES model
-    autoPtr<incompressible::LESModel> turbulence
+
+    // Construct incompressible turbulence model
+    autoPtr<incompressible::turbulenceModel> turbulence
     (
-        incompressible::LESModel::New(U, phi, twoPhaseProperties)
+        incompressible::turbulenceModel::New(U, phi, threePhaseProperties)
     );
diff --git a/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C b/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
new file mode 100644
index 000000000..42c7769bc
--- /dev/null
+++ b/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
@@ -0,0 +1,204 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Class
+    threePhaseMixture
+
+\*---------------------------------------------------------------------------*/
+
+#include "threePhaseMixture.H"
+#include "addToRunTimeSelectionTable.H"
+#include "surfaceFields.H"
+#include "fvc.H"
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+//- Calculate and return the laminar viscosity
+void Foam::threePhaseMixture::calcNu()
+{
+    // Average kinematic viscosity calculated from dynamic viscosity
+    nu_ = mu()/(alpha1_*rho1_ + alpha2_*rho2_ + alpha3_*rho3_);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::threePhaseMixture::threePhaseMixture
+(
+    const volVectorField& U,
+    const surfaceScalarField& phi
+)
+:
+    transportModel(U, phi),
+
+    phase1Name_("phase1"),
+    phase2Name_("phase2"),
+    phase3Name_("phase3"),
+
+    nuModel1_
+    (
+        viscosityModel::New
+        (
+            "nu1",
+            subDict(phase1Name_),
+            U,
+            phi
+        )
+    ),
+    nuModel2_
+    (
+        viscosityModel::New
+        (
+            "nu2",
+            subDict(phase2Name_),
+            U,
+            phi
+        )
+    ),
+    nuModel3_
+    (
+        viscosityModel::New
+        (
+            "nu3",
+            subDict(phase2Name_),
+            U,
+            phi
+        )
+    ),
+
+    rho1_(nuModel1_->viscosityProperties().lookup("rho")),
+    rho2_(nuModel2_->viscosityProperties().lookup("rho")),
+    rho3_(nuModel3_->viscosityProperties().lookup("rho")),
+
+    U_(U),
+    phi_(phi),
+
+    alpha1_(U_.db().lookupObject<const volScalarField> ("alpha1")),
+    alpha2_(U_.db().lookupObject<const volScalarField> ("alpha2")),
+    alpha3_(U_.db().lookupObject<const volScalarField> ("alpha3")),
+
+    nu_
+    (
+        IOobject
+        (
+            "nu",
+            U_.time().timeName(),
+            U_.db()
+        ),
+        U_.mesh(),
+        dimensionedScalar("nu", dimensionSet(0, 2, -1, 0, 0), 0),
+        calculatedFvPatchScalarField::typeName
+    )
+{
+    calcNu();
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField> Foam::threePhaseMixture::mu() const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            "mu",
+            alpha1_*rho1_*nuModel1_->nu()
+          + alpha2_*rho2_*nuModel2_->nu()
+          + alpha3_*rho3_*nuModel3_->nu()
+        )
+    );
+}
+
+
+Foam::tmp<Foam::surfaceScalarField> Foam::threePhaseMixture::muf() const
+{
+    surfaceScalarField alpha1f = fvc::interpolate(alpha1_);
+    surfaceScalarField alpha2f = fvc::interpolate(alpha2_);
+    surfaceScalarField alpha3f = fvc::interpolate(alpha3_);
+
+    return tmp<surfaceScalarField>
+    (
+        new surfaceScalarField
+        (
+            "mu",
+            alpha1f*rho1_*fvc::interpolate(nuModel1_->nu())
+          + alpha2f*rho2_*fvc::interpolate(nuModel2_->nu())
+          + alpha3f*rho3_*fvc::interpolate(nuModel3_->nu())
+        )
+    );
+}
+
+
+Foam::tmp<Foam::surfaceScalarField> Foam::threePhaseMixture::nuf() const
+{
+    surfaceScalarField alpha1f = fvc::interpolate(alpha1_);
+    surfaceScalarField alpha2f = fvc::interpolate(alpha2_);
+    surfaceScalarField alpha3f = fvc::interpolate(alpha3_);
+
+    return tmp<surfaceScalarField>
+    (
+        new surfaceScalarField
+        (
+            "nu",
+            (
+                alpha1f*rho1_*fvc::interpolate(nuModel1_->nu())
+              + alpha2f*rho2_*fvc::interpolate(nuModel2_->nu())
+              + alpha3f*rho3_*fvc::interpolate(nuModel3_->nu())
+            )/(alpha1f*rho1_ + alpha2f*rho2_ + alpha3f*rho3_)
+        )
+    );
+}
+
+
+bool Foam::threePhaseMixture::read()
+{
+    if (transportModel::read())
+    {
+        if
+        (
+            nuModel1_().read(*this)
+         && nuModel2_().read(*this)
+         && nuModel3_().read(*this)
+        )
+        {
+            nuModel1_->viscosityProperties().lookup("rho") >> rho1_;
+            nuModel2_->viscosityProperties().lookup("rho") >> rho2_;
+            nuModel3_->viscosityProperties().lookup("rho") >> rho3_;
+
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H b/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H
new file mode 100644
index 000000000..b55b75a2c
--- /dev/null
+++ b/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H
@@ -0,0 +1,197 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Class
+    threePhaseMixture
+
+Description
+
+SourceFiles
+    threePhaseMixture.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef threePhaseMixture_H
+#define threePhaseMixture_H
+
+#include "incompressible/transportModel/transportModel.H"
+#include "incompressible/viscosityModels/viscosityModel/viscosityModel.H"
+#include "dimensionedScalar.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class threePhaseMixture Declaration
+\*---------------------------------------------------------------------------*/
+
+class threePhaseMixture
+:
+    public transportModel
+{
+    // Private data
+
+        word phase1Name_;
+        word phase2Name_;
+        word phase3Name_;
+
+        autoPtr<viscosityModel> nuModel1_;
+        autoPtr<viscosityModel> nuModel2_;
+        autoPtr<viscosityModel> nuModel3_;
+
+        dimensionedScalar rho1_;
+        dimensionedScalar rho2_;
+        dimensionedScalar rho3_;
+
+        const volVectorField& U_;
+        const surfaceScalarField& phi_;
+
+        const volScalarField& alpha1_;
+        const volScalarField& alpha2_;
+        const volScalarField& alpha3_;
+
+        volScalarField nu_;
+
+
+    // Private Member Functions
+
+        //- Calculate and return the laminar viscosity
+        void calcNu();
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        threePhaseMixture
+        (
+            const volVectorField& U,
+            const surfaceScalarField& phi
+        );
+
+
+    // Destructor
+
+        ~threePhaseMixture()
+        {}
+
+
+    // Member Functions
+
+        //- Return const-access to phase1 viscosityModel
+        const viscosityModel& nuModel1() const
+        {
+            return nuModel1_();
+        }
+
+        //- Return const-access to phase2 viscosityModel
+        const viscosityModel& nuModel2() const
+        {
+            return nuModel2_();
+        }
+
+        //- Return const-access to phase3 viscosityModel
+        const viscosityModel& nuModel3() const
+        {
+            return nuModel3_();
+        }
+
+        //- Return const-access to phase1 density
+        const dimensionedScalar& rho1() const
+        {
+            return rho1_;
+        }
+
+        //- Return const-access to phase2 density
+        const dimensionedScalar& rho2() const
+        {
+            return rho2_;
+        };
+
+        //- Return const-access to phase3 density
+        const dimensionedScalar& rho3() const
+        {
+            return rho3_;
+        };
+
+        const volScalarField& alpha1() const
+        {
+            return alpha1_;
+        }
+
+        const volScalarField& alpha2() const
+        {
+            return alpha2_;
+        }
+
+        const volScalarField& alpha3() const
+        {
+            return alpha3_;
+        }
+
+        //- Return the velocity
+        const volVectorField& U() const
+        {
+            return U_;
+        }
+
+        //- Return the dynamic laminar viscosity
+        tmp<volScalarField> mu() const;
+
+        //- Return the face-interpolated dynamic laminar viscosity
+        tmp<surfaceScalarField> muf() const;
+
+        //- Return the kinematic laminar viscosity
+        const volScalarField& nu() const
+        {
+            return nu_;
+        }
+
+        //- Return the face-interpolated dynamic laminar viscosity
+        tmp<surfaceScalarField> nuf() const;
+
+        //- Correct the laminar viscosity
+        void correct()
+        {
+            calcNu();
+        }
+
+        //- Read base transportProperties dictionary
+        bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/lesInterFoam/lesInterFoam.C b/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
similarity index 70%
rename from applications/solvers/multiphase/lesInterFoam/lesInterFoam.C
rename to applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
index 0c0b0e698..3eaf09aa7 100644
--- a/applications/solvers/multiphase/lesInterFoam/lesInterFoam.C
+++ b/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
@@ -20,26 +20,23 @@ License
 
     You should have received a copy of the GNU General Public License
     along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 Application
-    lesInterFoam
+    interMixingFoam
 
 Description
-    Solver for 2 incompressible, isothermal immiscible fluids using a VOF
-    (volume of fluid) phase-fraction based interface capturing approach.
-    The momentum and other fluid properties are of the "mixture" and a single
-    momentum equation is solved.  Turbulence is modelled using a run-time
-    selectable incompressible LES model.
+    Solver for 3 incompressible fluids, two of which are miscible,
+    using a VOF method to capture the interface.
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "MULES.H"
 #include "subCycle.H"
-#include "interfaceProperties.H"
-#include "twoPhaseMixture.H"
-#include "incompressible/LESModel/LESModel.H"
+#include "threePhaseMixture.H"
+#include "threePhaseInterfaceProperties.H"
+#include "turbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,16 +45,16 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "readTimeControls.H"
-    #include "correctPhi.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
+    #include "correctPhi.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
@@ -69,33 +66,25 @@ int main(int argc, char *argv[])
         #include "setDeltaT.H"
 
         runTime++;
+
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        #include "gammaEqnSubCycle.H"
+        threePhaseProperties.correct();
 
-        turbulence->correct();
+        #include "alphaEqnsSubCycle.H"
 
+        #define twoPhaseProperties threePhaseProperties
         #include "UEqn.H"
 
         // --- PISO loop
-        for (int corr=0; corr < nCorr; corr++)
+        for (int corr=0; corr<nCorr; corr++)
         {
             #include "pEqn.H"
         }
 
         #include "continuityErrs.H"
 
-        p = pd + rho*gh;
-
-        if (pd.needReference())
-        {
-            p += dimensionedScalar
-            (
-                "p",
-                p.dimensions(),
-                pRefValue - getRefCellValue(p, pdRefCell)
-            );
-        }
+        turbulence->correct();
 
         runTime.write();
 
@@ -104,7 +93,7 @@ int main(int argc, char *argv[])
             << nl << endl;
     }
 
-    Info<< "End\n" << endl;
+    Info<< "\n end \n";
 
     return(0);
 }
diff --git a/applications/solvers/multiphase/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C b/applications/solvers/multiphase/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
new file mode 100644
index 000000000..0ea347f0d
--- /dev/null
+++ b/applications/solvers/multiphase/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
@@ -0,0 +1,209 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Application
+    threePhaseInterfaceProperties
+
+Description
+    Properties to aid interFoam :
+    1. Correct the alpha boundary condition for dynamic contact angle.
+    2. Calculate interface curvature.
+
+\*---------------------------------------------------------------------------*/
+
+#include "threePhaseInterfaceProperties.H"
+#include "alphaContactAngleFvPatchScalarField.H"
+#include "mathematicalConstants.H"
+#include "surfaceInterpolate.H"
+#include "fvcDiv.H"
+#include "fvcGrad.H"
+
+// * * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * //
+
+const Foam::scalar Foam::threePhaseInterfaceProperties::convertToRad =
+    Foam::mathematicalConstant::pi/180.0;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// Correction for the boundary condition on the unit normal nHat on
+// walls to produce the correct contact angle.
+
+// The dynamic contact angle is calculated from the component of the
+// velocity on the direction of the interface, parallel to the wall.
+
+void Foam::threePhaseInterfaceProperties::correctContactAngle
+(
+    surfaceVectorField::GeometricBoundaryField& nHatb
+) const
+{
+    const volScalarField::GeometricBoundaryField& alpha1 =
+        mixture_.alpha1().boundaryField();
+    const volScalarField::GeometricBoundaryField& alpha2 =
+        mixture_.alpha2().boundaryField();
+    const volScalarField::GeometricBoundaryField& alpha3 =
+        mixture_.alpha3().boundaryField();
+    const volVectorField::GeometricBoundaryField& U =
+        mixture_.U().boundaryField();
+
+    const fvMesh& mesh = mixture_.U().mesh();
+    const fvBoundaryMesh& boundary = mesh.boundary();
+
+    forAll(boundary, patchi)
+    {
+        if (isA<alphaContactAngleFvPatchScalarField>(alpha1[patchi]))
+        {
+            const alphaContactAngleFvPatchScalarField& a2cap =
+                refCast<const alphaContactAngleFvPatchScalarField>
+                (alpha2[patchi]);
+
+            const alphaContactAngleFvPatchScalarField& a3cap =
+                refCast<const alphaContactAngleFvPatchScalarField>
+                (alpha3[patchi]);
+
+            scalarField twoPhaseAlpha2 = max(a2cap, scalar(0));
+            scalarField twoPhaseAlpha3 = max(a3cap, scalar(0));
+
+            scalarField sumTwoPhaseAlpha =
+                twoPhaseAlpha2 + twoPhaseAlpha3 + SMALL;
+
+            twoPhaseAlpha2 /= sumTwoPhaseAlpha;
+            twoPhaseAlpha3 /= sumTwoPhaseAlpha;
+
+            fvsPatchVectorField& nHatp = nHatb[patchi];
+
+            scalarField theta =
+                convertToRad
+               *(
+                   twoPhaseAlpha2*(180 - a2cap.theta(U[patchi], nHatp))
+                 + twoPhaseAlpha3*(180 - a3cap.theta(U[patchi], nHatp))
+               );
+
+            vectorField nf = boundary[patchi].nf();
+
+            // Reset nHatPatch to correspond to the contact angle
+
+            scalarField a12 = nHatp & nf;
+
+            scalarField b1 = cos(theta);
+
+            scalarField b2(nHatp.size());
+
+            forAll(b2, facei)
+            {
+                b2[facei] = cos(acos(a12[facei]) - theta[facei]);
+            }
+
+            scalarField det = 1.0 - a12*a12;
+
+            scalarField a = (b1 - a12*b2)/det;
+            scalarField b = (b2 - a12*b1)/det;
+
+            nHatp = a*nf + b*nHatp;
+
+            nHatp /= (mag(nHatp) + deltaN_.value());
+        }
+    }
+}
+
+
+void Foam::threePhaseInterfaceProperties::calculateK()
+{
+    const volScalarField& alpha1 = mixture_.alpha1();
+
+    const fvMesh& mesh = alpha1.mesh();
+    const surfaceVectorField& Sf = mesh.Sf();
+
+    // Cell gradient of alpha
+    volVectorField gradAlpha = fvc::grad(alpha1);
+
+    // Interpolated face-gradient of alpha
+    surfaceVectorField gradAlphaf = fvc::interpolate(gradAlpha);
+
+    // Face unit interface normal
+    surfaceVectorField nHatfv = gradAlphaf/(mag(gradAlphaf) + deltaN_);
+    correctContactAngle(nHatfv.boundaryField());
+
+    // Face unit interface normal flux
+    nHatf_ = nHatfv & Sf;
+
+    // Simple expression for curvature
+    K_ = -fvc::div(nHatf_);
+
+    // Complex expression for curvature.
+    // Correction is formally zero but numerically non-zero.
+    //volVectorField nHat = gradAlpha/(mag(gradAlpha) + deltaN_);
+    //nHat.boundaryField() = nHatfv.boundaryField();
+    //K_ = -fvc::div(nHatf_) + (nHat & fvc::grad(nHatfv) & nHat);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties
+(
+    const threePhaseMixture& mixture
+)
+:
+    mixture_(mixture),
+    cAlpha_
+    (
+        readScalar
+        (
+            mixture.U().mesh().solutionDict().subDict("PISO").lookup("cAlpha")
+        )
+    ),
+    sigma12_(mixture.lookup("sigma12")),
+    sigma13_(mixture.lookup("sigma13")),
+
+    deltaN_
+    (
+        "deltaN",
+        1e-8/pow(average(mixture.U().mesh().V()), 1.0/3.0)
+    ),
+
+    nHatf_
+    (
+        (
+            fvc::interpolate(fvc::grad(mixture.alpha1()))
+           /(mag(fvc::interpolate(fvc::grad(mixture.alpha1()))) + deltaN_)
+        ) & mixture.alpha1().mesh().Sf()
+    ),
+
+    K_
+    (
+        IOobject
+        (
+            "K",
+            mixture.alpha1().time().timeName(),
+            mixture.alpha1().mesh()
+        ),
+        -fvc::div(nHatf_)
+    )
+{
+    calculateK();
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H b/applications/solvers/multiphase/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
new file mode 100644
index 000000000..b5594b6e9
--- /dev/null
+++ b/applications/solvers/multiphase/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
@@ -0,0 +1,157 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Class
+    threePhaseInterfaceProperties
+
+Description
+    Properties to aid interFoam :
+    1. Correct the alpha boundary condition for dynamic contact angle.
+    2. Calculate interface curvature.
+
+SourceFiles
+    threePhaseInterfaceProperties.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef threePhaseInterfaceProperties_H
+#define threePhaseInterfaceProperties_H
+
+#include "threePhaseMixture.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+              Class threePhaseInterfaceProperties Declaration
+\*---------------------------------------------------------------------------*/
+
+class threePhaseInterfaceProperties
+{
+    // Private data
+
+        const threePhaseMixture& mixture_;
+
+        //- Compression coefficient
+        scalar cAlpha_;
+
+        //- Surface tension 1-2
+        dimensionedScalar sigma12_;
+
+        //- Surface tension 1-3
+        dimensionedScalar sigma13_;
+
+        //- Stabilisation for normalisation of the interface normal
+        const dimensionedScalar deltaN_;
+
+        surfaceScalarField nHatf_;
+        volScalarField K_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct and assignment
+        threePhaseInterfaceProperties(const threePhaseInterfaceProperties&);
+        void operator=(const threePhaseInterfaceProperties&);
+
+        //- Correction for the boundary condition on the unit normal nHat on
+        //  walls to produce the correct contact dynamic angle
+        //  calculated from the component of U parallel to the wall
+        void correctContactAngle
+        (
+            surfaceVectorField::GeometricBoundaryField& nHat
+        ) const;
+
+        //- Re-calculate the interface curvature
+        void calculateK();
+
+
+public:
+
+    //- Conversion factor for degrees into radians
+    static const scalar convertToRad;
+
+
+    // Constructors
+
+        //- Construct from volume fraction field alpha and IOdictionary
+        threePhaseInterfaceProperties(const threePhaseMixture& mixture);
+
+
+    // Member Functions
+
+        scalar cAlpha() const
+        {
+            return cAlpha_;
+        }
+
+        const dimensionedScalar& deltaN() const
+        {
+            return deltaN_;
+        }
+
+        const surfaceScalarField& nHatf() const
+        {
+            return nHatf_;
+        }
+
+        const volScalarField& K() const
+        {
+            return K_;
+        }
+
+        tmp<volScalarField> sigma() const
+        {
+            volScalarField limitedAlpha2 = max(mixture_.alpha2(), scalar(0));
+            volScalarField limitedAlpha3 = max(mixture_.alpha3(), scalar(0));
+
+            return
+                (limitedAlpha2*sigma12_ + limitedAlpha3*sigma13_)
+               /(limitedAlpha2 + limitedAlpha3 + SMALL);
+        }
+
+        tmp<volScalarField> sigmaK() const
+        {
+            return sigma()*K_;
+        }
+
+        void correct()
+        {
+            calculateK();
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
index fa6943e58..c427781c7 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
@@ -2,13 +2,14 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
     -IphaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -linterfaceProperties \
     -lincompressibleTransportModels \
+    -lincompressibleRASModels \
     -lincompressibleLESModels \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -llduSolvers
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H
index fefdeb41c..c59137c7b 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H
@@ -1,15 +1,18 @@
-    surfaceScalarField muf =
+    surfaceScalarField muEff
+    (
+        "muEff",
         twoPhaseProperties->muf()
-      + fvc::interpolate(rho*turbulence->nuSgs());
+      + fvc::interpolate(rho*turbulence->nut())
+    );
 
     fvVectorMatrix UEqn
     (
         fvm::ddt(rho, U)
       + fvm::div(rhoPhi, U)
       - fvm::Sp(fvc::ddt(rho) + fvc::div(rhoPhi), U)
-      - fvm::laplacian(muf, U)
-      - (fvc::grad(U) & fvc::grad(muf))
-    //- fvc::div(muf*(fvc::interpolate(dev2(fvc::grad(U))) & mesh.Sf()))
+      - fvm::laplacian(muEff, U)
+      - (fvc::grad(U) & fvc::grad(muEff))
+    //- fvc::div(muEff*(fvc::interpolate(dev2(fvc::grad(U))) & mesh.Sf()))
     );
 
     UEqn.relax();
@@ -23,7 +26,7 @@
             fvc::reconstruct
             (
                 (
-                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
+                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
                   - ghf*fvc::snGrad(rho)
                   - fvc::snGrad(pd)
                 ) * mesh.magSf()
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/gammaEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
similarity index 57%
rename from applications/solvers/multiphase/interPhaseChangeFoam/gammaEqn.H
rename to applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
index 018694892..a232056b8 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/gammaEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
@@ -1,23 +1,23 @@
 {
-    word gammaScheme("div(phi,gamma)");
-    word gammarScheme("div(phirb,gamma)");
+    word alphaScheme("div(phi,alpha)");
+    word alpharScheme("div(phirb,alpha)");
 
     surfaceScalarField phir("phir", phic*interface.nHatf());
 
-    for (int gCorr=0; gCorr<nGammaCorr; gCorr++)
+    for (int gCorr=0; gCorr<nAlphaCorr; gCorr++)
     {
-        surfaceScalarField phiGamma =
+        surfaceScalarField phiAlpha =
             fvc::flux
             (
                 phi,
-                gamma,
-                gammaScheme
+                alpha1,
+                alphaScheme
             )
           + fvc::flux
             (
-                -fvc::flux(-phir, scalar(1) - gamma, gammarScheme),
-                gamma,
-                gammarScheme
+                -fvc::flux(-phir, scalar(1) - alpha1, alpharScheme),
+                alpha1,
+                alpharScheme
             );
 
         Pair<tmp<volScalarField> > vDotAlphal =
@@ -46,22 +46,22 @@
             ),
             // Divergence term is handled explicitly to be
             // consistent with the explicit transport solution
-            divU*gamma
+            divU*alpha1
           + vDotcAlphal
         );
 
-        //MULES::explicitSolve(gamma, phi, phiGamma, 1, 0);
-        //MULES::explicitSolve(oneField(), gamma, phi, phiGamma, Sp, Su, 1, 0);
-        MULES::implicitSolve(oneField(), gamma, phi, phiGamma, Sp, Su, 1, 0);
+        //MULES::explicitSolve(alpha1, phi, phiAlpha, 1, 0);
+        //MULES::explicitSolve(geometricOneField(), alpha1, phi, phiAlpha, Sp, Su, 1, 0);
+        MULES::implicitSolve(geometricOneField(), alpha1, phi, phiAlpha, Sp, Su, 1, 0);
 
         rhoPhi +=
             (runTime.deltaT()/totalDeltaT)
-           *(phiGamma*(rho1 - rho2) + phi*rho2);
+           *(phiAlpha*(rho1 - rho2) + phi*rho2);
     }
 
     Info<< "Liquid phase volume fraction = "
-        << gamma.weightedAverage(mesh.V()).value()
-        << "  Min(gamma) = " << min(gamma).value()
-        << "  Max(gamma) = " << max(gamma).value()
+        << alpha1.weightedAverage(mesh.V()).value()
+        << "  Min(alpha1) = " << min(alpha1).value()
+        << "  Max(alpha1) = " << max(alpha1).value()
         << endl;
 }
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/gammaEqnSubCycle.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
similarity index 53%
rename from applications/solvers/multiphase/interPhaseChangeFoam/gammaEqnSubCycle.H
rename to applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
index c6355d6fb..dd1d82803 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/gammaEqnSubCycle.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
@@ -11,37 +11,37 @@ surfaceScalarField rhoPhi
 );
 
 {
-    label nGammaCorr
+    label nAlphaCorr
     (
-        readLabel(piso.lookup("nGammaCorr"))
+        readLabel(piso.lookup("nAlphaCorr"))
     );
 
-    label nGammaSubCycles
+    label nAlphaSubCycles
     (
-        readLabel(piso.lookup("nGammaSubCycles"))
+        readLabel(piso.lookup("nAlphaSubCycles"))
     );
 
     surfaceScalarField phic = mag(phi/mesh.magSf());
-    phic = min(interface.cGamma()*phic, max(phic));
+    phic = min(interface.cAlpha()*phic, max(phic));
 
     volScalarField divU = fvc::div(phi);
 
     dimensionedScalar totalDeltaT = runTime.deltaT();
 
-    if (nGammaSubCycles > 1)
+    if (nAlphaSubCycles > 1)
     {
         for
         (
-            subCycle<volScalarField> gammaSubCycle(gamma, nGammaSubCycles);
-            !(++gammaSubCycle).end();
+            subCycle<volScalarField> alphaSubCycle(alpha1, nAlphaSubCycles);
+            !(++alphaSubCycle).end();
         )
         {
-#           include "gammaEqn.H"
+#           include "alphaEqn.H"
         }
     }
     else
     {
-#       include "gammaEqn.H"
+#       include "alphaEqn.H"
     }
 
     if (nOuterCorr == 1)
@@ -49,5 +49,5 @@ surfaceScalarField rhoPhi
         interface.correct();
     }
 
-    rho == gamma*rho1 + (scalar(1) - gamma)*rho2;
+    rho == alpha1*rho1 + (scalar(1) - alpha1)*rho2;
 }
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
index 171e1670f..ed5ccc9a7 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
@@ -1,7 +1,11 @@
 {
 #   include "continuityErrs.H"
 
-    wordList pcorrTypes(pd.boundaryField().types());
+    wordList pcorrTypes
+    (
+        pd.boundaryField().size(),
+        zeroGradientFvPatchScalarField::typeName
+    );
 
     for (label i=0; i<pd.boundaryField().size(); i++)
     {
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H
index 9e9c68a89..50cc07e7a 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H
@@ -12,12 +12,12 @@
         mesh
     );
 
-    Info<< "Reading field gamma\n" << endl;
-    volScalarField gamma
+    Info<< "Reading field alpha1\n" << endl;
+    volScalarField alpha1
     (
         IOobject
         (
-            "gamma",
+            "alpha1",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -44,7 +44,7 @@
 
     Info<< "Creating phaseChangeTwoPhaseMixture\n" << endl;
     autoPtr<phaseChangeTwoPhaseMixture> twoPhaseProperties =
-        phaseChangeTwoPhaseMixture::New(U, phi, "gamma");
+        phaseChangeTwoPhaseMixture::New(U, phi, "alpha1");
 
     const dimensionedScalar& rho1 = twoPhaseProperties->rho1();
     const dimensionedScalar& rho2 = twoPhaseProperties->rho2();
@@ -60,19 +60,32 @@
             mesh,
             IOobject::READ_IF_PRESENT
         ),
-        gamma*rho1 + (scalar(1) - gamma)*rho2,
-        gamma.boundaryField().types()
+        alpha1*rho1 + (scalar(1) - alpha1)*rho2,
+        alpha1.boundaryField().types()
     );
     rho.oldTime();
 
 
-    label pdRefCell = 0;
-    scalar pdRefValue = 0.0;
-    setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
+    // Mass flux
+    // Initialisation does not matter because rhoPhi is reset after the
+    // alpha1 solution before it is used in the U equation.
+    surfaceScalarField rhoPhi
+    (
+        IOobject
+        (
+            "rho*phi",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        rho1*phi
+    );
 
-    Info<< "Calculating field g.h" << endl;
+
+    Info<< "Calculating field g.h\n" << endl;
     volScalarField gh("gh", g & mesh.C());
-    surfaceScalarField ghf("ghf", g & mesh.Cf());
+    surfaceScalarField ghf("gh", g & mesh.Cf());
 
     volScalarField p
     (
@@ -88,11 +101,32 @@
     );
 
 
-    // Construct interface from gamma distribution
-    interfaceProperties interface(gamma, U, twoPhaseProperties());
+    label pdRefCell = 0;
+    scalar pdRefValue = 0.0;
+    setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
 
-    // Construct LES model
-    autoPtr<incompressible::LESModel> turbulence
+    scalar pRefValue = 0.0;
+
+    if (pd.needReference())
+    {
+        pRefValue = readScalar
+        (
+            mesh.solutionDict().subDict("PISO").lookup("pRefValue")
+        );
+
+        p += dimensionedScalar
+        (
+            "p",
+            p.dimensions(),
+            pRefValue - getRefCellValue(p, pdRefCell)
+        );
+    }
+
+    // Construct interface from alpha1 distribution
+    interfaceProperties interface(alpha1, U, twoPhaseProperties());
+
+    // Construct incompressible turbulence model
+    autoPtr<incompressible::turbulenceModel> turbulence
     (
-        incompressible::LESModel::New(U, phi, twoPhaseProperties())
+        incompressible::turbulenceModel::New(U, phi, twoPhaseProperties())
     );
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index caae02a3f..2f44534ce 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -28,13 +28,17 @@ Application
 Description
     Solver for 2 incompressible, isothermal immiscible fluids with phase-change
     (e.g. cavitation).  Uses a VOF (volume of fluid) phase-fraction based
-    interface capturing approach.  The momentum and other fluid properties are
-    of the "mixture" and a single momentum equation is solved.
+    interface capturing approach.
+
+    The momentum and other fluid properties are of the "mixture" and a
+    single momentum equation is solved.
 
     The set of phase-change models provided are designed to simulate cavitation
     but other mechanisms of phase-change are supported within this solver
     framework.
 
+    Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
+
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
@@ -42,23 +46,23 @@ Description
 #include "subCycle.H"
 #include "interfaceProperties.H"
 #include "phaseChangeTwoPhaseMixture.H"
-#include "incompressible/LESModel/LESModel.H"
+#include "turbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
-    #include "createTime.H"
-    #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
-    #include "readPISOControls.H"
-    #include "initContinuityErrs.H"
-    #include "createFields.H"
-    #include "readTimeControls.H"
-    #include "correctPhi.H"
-    #include "CourantNo.H"
-    #include "setInitialDeltaT.H"
+#   include "setRootCase.H"
+#   include "createTime.H"
+#   include "createMesh.H"
+#   include "readGravitationalAcceleration.H"
+#   include "readPISOControls.H"
+#   include "initContinuityErrs.H"
+#   include "createFields.H"
+#   include "readTimeControls.H"
+#   include "correctPhi.H"
+#   include "CourantNo.H"
+#   include "setInitialDeltaT.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,18 +70,16 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readPISOControls.H"
-        #include "readTimeControls.H"
-        #include "CourantNo.H"
-        #include "setDeltaT.H"
+#       include "readPISOControls.H"
+#       include "readTimeControls.H"
+#       include "CourantNo.H"
+#       include "setDeltaT.H"
 
         runTime++;
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        twoPhaseProperties->correct();
-
-        #include "gammaEqnSubCycle.H"
+#       include "alphaEqnSubCycle.H"
 
         turbulence->correct();
 
@@ -89,12 +91,14 @@ int main(int argc, char *argv[])
             // --- PISO loop
             for (int corr=0; corr<nCorr; corr++)
             {
-                #include "pEqn.H"
+#               include "pEqn.H"
             }
 
-            #include "continuityErrs.H"
+#            include "continuityErrs.H"
         }
 
+        twoPhaseProperties->correct();
+
         runTime.write();
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
@@ -104,7 +108,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
index 3a7f7e4eb..a89d2d08a 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
@@ -11,13 +11,14 @@
       + fvc::ddtPhiCorr(rUA, rho, U, phi)
     );
 
+    adjustPhi(phiU, U, p);
+
     phi = phiU +
         (
-            fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
+            fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
           - ghf*fvc::snGrad(rho)
         )*rUAf*mesh.magSf();
 
-    adjustPhi(phi, U, pd);
 
     Pair<tmp<volScalarField> > vDotP = twoPhaseProperties->vDotP();
     const volScalarField& vDotcP = vDotP[0]();
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/Make/files b/applications/solvers/multiphase/lesCavitatingFoam/Make/files
deleted file mode 100644
index b577562e2..000000000
--- a/applications/solvers/multiphase/lesCavitatingFoam/Make/files
+++ /dev/null
@@ -1,5 +0,0 @@
-lesCavitatingFoam.C
-
-devOneEqEddy/devOneEqEddy.C
-
-EXE = $(FOAM_APPBIN)/lesCavitatingFoam
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H b/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H
deleted file mode 100644
index 73033ddfa..000000000
--- a/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H
+++ /dev/null
@@ -1,20 +0,0 @@
-    surfaceScalarField muEff
-    (
-        "muEff",
-        twoPhaseProperties.muf()
-      + fvc::interpolate(rho*turbulence->nuSgs())
-    );
-
-    fvVectorMatrix UEqn
-    (
-        fvm::ddt(rho, U)
-      + fvm::div(phi, U)
-      - fvm::laplacian(muEff, U)
-    //- (fvc::grad(U) & fvc::grad(muf))
-      - fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
-    );
-
-    if (momentumPredictor)
-    {
-        solve(UEqn == -fvc::grad(p));
-    }
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/createFields.H b/applications/solvers/multiphase/lesCavitatingFoam/createFields.H
deleted file mode 100644
index d2e19bcae..000000000
--- a/applications/solvers/multiphase/lesCavitatingFoam/createFields.H
+++ /dev/null
@@ -1,85 +0,0 @@
-    Info<< "Reading field p\n" << endl;
-    volScalarField p
-    (
-        IOobject
-        (
-            "p",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    volScalarField gamma
-    (
-        IOobject
-        (
-            "gamma",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        max(min((rho - rholSat)/(rhovSat - rholSat), scalar(1)), scalar(0))
-    );
-    gamma.oldTime();
-
-    Info<< "Creating compressibilityModel\n" << endl;
-    autoPtr<barotropicCompressibilityModel> psiModel = 
-        barotropicCompressibilityModel::New
-        (
-            thermodynamicProperties,
-            gamma
-        );
-
-    const volScalarField& psi = psiModel->psi();
-
-    rho == max
-    (
-        psi*p
-      + (1.0 - gamma)*rhol0
-      + ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat,
-        rhoMin
-    );
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-#   include "createPhiv.H"
-#   include "compressibleCreatePhi.H"
-
-    Info<< "Reading transportProperties\n" << endl;
-
-    twoPhaseMixture twoPhaseProperties(U, phiv, "gamma");
-
-    // Create LES model
-    autoPtr<incompressible::LESModel> turbulence
-    (
-        incompressible::LESModel::New(U, phiv, twoPhaseProperties)
-    );
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C
deleted file mode 100644
index 682a49a34..000000000
--- a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C
+++ /dev/null
@@ -1,130 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "devOneEqEddy.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(devOneEqEddy, 0);
-addToRunTimeSelectionTable(LESModel, devOneEqEddy, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-devOneEqEddy::devOneEqEddy
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    transportModel& transport
-)
-:
-    LESModel(typeName, U, phi, transport),
-    GenEddyVisc(U, phi, transport),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-    ck_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ck",
-            coeffDict(),
-            0.07
-        )
-    )
-{
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void devOneEqEddy::correct(const tmp<volTensorField>& gradU)
-{
-    GenEddyVisc::correct(gradU);
-
-    //volScalarField G = 2*nuSgs_*magSqr(symm(gradU));
-    volScalarField G = 2*nuSgs_*(gradU() && dev(symm(gradU())));
-
-    solve
-    (
-       fvm::ddt(k_)
-     + fvm::div(phi(), k_)
-     - fvm::Sp(fvc::div(phi()), k_)
-     - fvm::laplacian(DkEff(), k_)
-    ==
-       G
-     - fvm::Sp(ce_*sqrt(k_)/delta(), k_)
-    );
-
-    bound(k_, k0());
-
-    nuSgs_ = ck_*sqrt(k_)*delta();
-    nuSgs_.correctBoundaryConditions();
-}
-
-
-bool devOneEqEddy::read()
-{
-    if (GenEddyVisc::read())
-    {
-        ck_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C b/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C
deleted file mode 100644
index f41a99923..000000000
--- a/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C
+++ /dev/null
@@ -1,94 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    lesCavitatingFoam
-
-Description
-    Transient cavitation code with LES turbulence.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "barotropicCompressibilityModel.H"
-#include "twoPhaseMixture.H"
-#include "incompressible/LESModel/LESModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-
-#   include "setRootCase.H"
-
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "readThermodynamicProperties.H"
-#   include "readControls.H"
-#   include "createFields.H"
-#   include "initContinuityErrs.H"
-#   include "compressibleCourantNo.H"
-#   include "setInitialDeltaT.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.run())
-    {
-#       include "readControls.H"
-#       include "CourantNo.H"
-#       include "setDeltaT.H"
-
-        runTime++;
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        turbulence->correct();
-
-        for (int outerCorr=0; outerCorr<nOuterCorr; outerCorr++)
-        {
-#           include "rhoEqn.H"
-#           include "gammaPsi.H"
-#           include "UEqn.H"
-
-            for (int corr=0; corr<nCorr; corr++)
-            {
-#               include "pEqn.H"
-            }
-        }
-
-        runTime.write();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "\n end \n";
-
-    return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/pEqn.H b/applications/solvers/multiphase/lesCavitatingFoam/pEqn.H
deleted file mode 100644
index c9382dfc0..000000000
--- a/applications/solvers/multiphase/lesCavitatingFoam/pEqn.H
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    if (nOuterCorr == 1)
-    {
-        p = 
-        (
-            rho
-          - (1.0 - gamma)*rhol0
-          - ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat
-        )/psi;
-    }
-
-    surfaceScalarField rhof = fvc::interpolate(rho, "rhof");
-
-    volScalarField rUA = 1.0/UEqn.A();
-    surfaceScalarField rUAf("rUAf", rhof*fvc::interpolate(rUA));
-    volVectorField HbyA = rUA*UEqn.H();
-
-    phiv = (fvc::interpolate(HbyA) & mesh.Sf())
-         + fvc::ddtPhiCorr(rUA, rho, U, phiv);
-
-    p.boundaryField().updateCoeffs();
-
-    surfaceScalarField phiGradp = rUAf*mesh.magSf()*fvc::snGrad(p);
-
-    phiv -= phiGradp/rhof;
-
-#   include "resetPhivPatches.H"
-
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-    {
-        fvScalarMatrix pEqn
-        (
-            fvm::ddt(psi, p)
-          - (rhol0 + (psil - psiv)*pSat)*fvc::ddt(gamma) - pSat*fvc::ddt(psi)
-          + fvc::div(phiv, rho)
-          + fvc::div(phiGradp)
-          - fvm::laplacian(rUAf, p)
-        );
-
-        pEqn.solve();
-
-        if (nonOrth == nNonOrthCorr)
-        {
-            phiv += (phiGradp + pEqn.flux())/rhof;
-        }
-    }
-
-    Info<< "max-min p: " << max(p).value()
-        << " " << min(p).value() << endl;
-
-
-    U = HbyA - rUA*fvc::grad(p);
-
-    // Remove the swirl component of velocity for "wedge" cases
-    if (piso.found("removeSwirl"))
-    {
-        label swirlCmpt(readLabel(piso.lookup("removeSwirl")));
-
-        Info<< "Removing swirl component-" << swirlCmpt << " of U" << endl;
-        U.field().replace(swirlCmpt, 0.0);
-    }
-
-    U.correctBoundaryConditions();
-
-    Info<< "max(U) " << max(mag(U)).value() << endl;
-
-    rho == max
-    (
-        psi*p
-      + (1.0 - gamma)*rhol0
-      + ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat,
-        rhoMin
-    );
-
-    Info<< "max-min rho: " << max(rho).value()
-        << " " << min(rho).value() << endl;
-
-#   include "gammaPsi.H"
-
-}
diff --git a/applications/solvers/multiphase/lesInterFoam/Make/files b/applications/solvers/multiphase/lesInterFoam/Make/files
deleted file mode 100644
index 40039bd1a..000000000
--- a/applications/solvers/multiphase/lesInterFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-lesInterFoam.C
-
-EXE = $(FOAM_APPBIN)/lesInterFoam
diff --git a/applications/solvers/multiphase/lesInterFoam/Make/options b/applications/solvers/multiphase/lesInterFoam/Make/options
deleted file mode 100644
index 34b98a088..000000000
--- a/applications/solvers/multiphase/lesInterFoam/Make/options
+++ /dev/null
@@ -1,16 +0,0 @@
-EXE_INC = \
-    -Iaveraging \
-    -I../interFoam \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
-    -linterfaceProperties \
-    -lincompressibleTransportModels \
-    -lincompressibleLESModels \
-    -lfiniteVolume \
-    -llduSolvers
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
index 0af824e9f..4f63a8e54 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
@@ -6,10 +6,14 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -linterfaceProperties \
     -lincompressibleTransportModels \
+    -lincompressibleTransportModels \
+    -lincompressibleRASModels \
+    -lincompressibleLESModels \
     -lfiniteVolume \
     -llduSolvers
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
index 4f71f75ba..ef92fb9bc 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
@@ -46,9 +46,46 @@
 
 
     Info<< "Calculating field g.h\n" << endl;
+    volScalarField gh("gh", g & mesh.C());
     surfaceScalarField ghf("gh", g & mesh.Cf());
 
+    volScalarField p
+    (
+        IOobject
+        (
+            "p",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        pd + rho*gh
+    );
+
 
     label pdRefCell = 0;
     scalar pdRefValue = 0.0;
     setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
+
+    scalar pRefValue = 0.0;
+
+    if (pd.needReference())
+    {
+        pRefValue = readScalar
+        (
+            mesh.solutionDict().subDict("PISO").lookup("pRefValue")
+        );
+
+        p += dimensionedScalar
+        (
+            "p",
+            p.dimensions(),
+            pRefValue - getRefCellValue(p, pdRefCell)
+        );
+    }
+
+    // Construct incompressible turbulence model
+    autoPtr<incompressible::turbulenceModel> turbulence
+    (
+        incompressible::turbulenceModel::New(U, phi, mixture)
+    );
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index 4d7f78da9..54cab3275 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -27,22 +27,24 @@ Application
 
 Description
     Solver for n incompressible fluids which captures the interfaces and
-    includes surface-tension and contact-angle effects for each.
+    includes surface-tension and contact-angle effects for each phase.
+
+    Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "multiphaseMixture.H"
+#include "turbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
-
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
-#   include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
 #   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
@@ -79,6 +81,8 @@ int main(int argc, char *argv[])
 
 #       include "continuityErrs.H"
 
+        turbulence->correct();
+
         runTime.write();
 
         Info<< "ExecutionTime = "
@@ -88,7 +92,7 @@ int main(int argc, char *argv[])
 
     Info<< "\n end \n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/porousInterFoam/Make/files b/applications/solvers/multiphase/porousInterFoam/Make/files
new file mode 100644
index 000000000..dda65f11f
--- /dev/null
+++ b/applications/solvers/multiphase/porousInterFoam/Make/files
@@ -0,0 +1,3 @@
+porousInterFoam.C
+
+EXE = $(FOAM_APPBIN)/porousInterFoam
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/Make/options b/applications/solvers/multiphase/porousInterFoam/Make/options
similarity index 58%
rename from applications/solvers/multiphase/compressibleLesInterFoam/Make/options
rename to applications/solvers/multiphase/porousInterFoam/Make/options
index 45e4e10f6..82185b813 100644
--- a/applications/solvers/multiphase/compressibleLesInterFoam/Make/options
+++ b/applications/solvers/multiphase/porousInterFoam/Make/options
@@ -1,15 +1,19 @@
 INTERFOAM = $(FOAM_SOLVERS)/multiphase/interFoam
 
 EXE_INC = \
+    -I$(INTERFOAM) \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -linterfaceProperties \
     -lincompressibleTransportModels \
+    -lincompressibleRASModels \
     -lincompressibleLESModels \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lmeshTools
+
diff --git a/applications/solvers/multiphase/porousInterFoam/UEqn.H b/applications/solvers/multiphase/porousInterFoam/UEqn.H
new file mode 100644
index 000000000..efb1df5ea
--- /dev/null
+++ b/applications/solvers/multiphase/porousInterFoam/UEqn.H
@@ -0,0 +1,39 @@
+    surfaceScalarField muEff
+    (
+        "muEff",
+        twoPhaseProperties.muf()
+      + fvc::interpolate(rho*turbulence->nut())
+    );
+
+    // Calculate and cache mu for the porous media
+    volScalarField mu(twoPhaseProperties.mu());
+
+    fvVectorMatrix UEqn
+    (
+        pZones.ddt(rho, U)
+      + fvm::div(rhoPhi, U)
+      - fvm::laplacian(muEff, U)
+      - (fvc::grad(U) & fvc::grad(muEff))
+    //- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
+    );
+
+    UEqn.relax();
+
+    pZones.addResistance(UEqn);
+
+    if (momentumPredictor)
+    {
+        solve
+        (
+            UEqn
+         ==
+            fvc::reconstruct
+            (
+                fvc::interpolate(rho)*(g & mesh.Sf())
+              + (
+                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
+                  - fvc::snGrad(p)
+                ) * mesh.magSf()
+            )
+        );
+    }
diff --git a/applications/solvers/multiphase/rasInterFoam/createFields.H b/applications/solvers/multiphase/porousInterFoam/createFields.H
similarity index 78%
rename from applications/solvers/multiphase/rasInterFoam/createFields.H
rename to applications/solvers/multiphase/porousInterFoam/createFields.H
index 2d932dadc..f441e8b33 100644
--- a/applications/solvers/multiphase/rasInterFoam/createFields.H
+++ b/applications/solvers/multiphase/porousInterFoam/createFields.H
@@ -12,12 +12,12 @@
         mesh
     );
 
-    Info<< "Reading field gamma\n" << endl;
-    volScalarField gamma
+    Info<< "Reading field alpha1\n" << endl;
+    volScalarField alpha1
     (
         IOobject
         (
-            "gamma",
+            "alpha1",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -42,8 +42,9 @@
 
 #   include "createPhi.H"
 
+
     Info<< "Reading transportProperties\n" << endl;
-    twoPhaseMixture twoPhaseProperties(U, phi, "gamma");
+    twoPhaseMixture twoPhaseProperties(U, phi, "alpha1");
 
     const dimensionedScalar& rho1 = twoPhaseProperties.rho1();
     const dimensionedScalar& rho2 = twoPhaseProperties.rho2();
@@ -59,15 +60,15 @@
             mesh,
             IOobject::READ_IF_PRESENT
         ),
-        gamma*rho1 + (scalar(1) - gamma)*rho2,
-        gamma.boundaryField().types()
+        alpha1*rho1 + (scalar(1) - alpha1)*rho2,
+        alpha1.boundaryField().types()
     );
     rho.oldTime();
 
 
     // Mass flux
     // Initialisation does not matter because rhoPhi is reset after the
-    // gamma solution before it is used in the U equation.
+    // alpha1 solution before it is used in the U equation.
     surfaceScalarField rhoPhi
     (
         IOobject
@@ -86,7 +87,6 @@
     volScalarField gh("gh", g & mesh.C());
     surfaceScalarField ghf("gh", g & mesh.Cf());
 
-
     volScalarField p
     (
         IOobject
@@ -122,11 +122,13 @@
         );
     }
 
-    // Construct interface from gamma distribution
-    interfaceProperties interface(gamma, U, twoPhaseProperties);
+    // Construct interface from alpha1 distribution
+    interfaceProperties interface(alpha1, U, twoPhaseProperties);
 
-    // Construct RAS model
-    autoPtr<incompressible::RASModel> turbulence
+     // Construct incompressible turbulence model
+    autoPtr<incompressible::turbulenceModel> turbulence
     (
-        incompressible::RASModel::New(U, phi, twoPhaseProperties)
+        incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
     );
+
+    porousZones pZones(mesh);
diff --git a/applications/solvers/multiphase/rasInterFoam/rasInterFoam.C b/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
similarity index 82%
rename from applications/solvers/multiphase/rasInterFoam/rasInterFoam.C
rename to applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
index 4fee888ef..3c7643ecd 100644
--- a/applications/solvers/multiphase/rasInterFoam/rasInterFoam.C
+++ b/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
@@ -23,14 +23,19 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    rasInterFoam
+    porousInterFoam
 
 Description
     Solver for 2 incompressible, isothermal immiscible fluids using a VOF
     (volume of fluid) phase-fraction based interface capturing approach.
     The momentum and other fluid properties are of the "mixture" and a single
-    momentum equation is solved.  Turbulence is modelled using a run-time
-    selectable incompressible RAS model.
+    momentum equation is solved.
+
+    Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
+
+    For a two-fluid approach see twoPhaseEulerFoam.
+
+    Explicit handling of porous zones is included.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,7 +44,8 @@ Description
 #include "subCycle.H"
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
-#include "incompressible/RASModel/RASModel.H"
+#include "turbulenceModel.H"
+#include "porousZones.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,7 +54,7 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
-#   include "readEnvironmentalProperties.H"
+#   include "readGravitationalAcceleration.H"
 #   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
@@ -57,7 +63,7 @@ int main(int argc, char *argv[])
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
@@ -72,30 +78,20 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "gammaEqnSubCycle.H"
+        twoPhaseProperties.correct();
+
+#       include "alphaEqnSubCycle.H"
 
 #       include "UEqn.H"
 
         // --- PISO loop
-        for (int corr=0; corr < nCorr; corr++)
+        for (int corr=0; corr<nCorr; corr++)
         {
 #           include "pEqn.H"
         }
 
 #       include "continuityErrs.H"
 
-        p = pd + rho*gh;
-
-        if (pd.needReference())
-        {
-            p += dimensionedScalar
-            (
-                "p",
-                p.dimensions(),
-                pRefValue - getRefCellValue(p, pdRefCell)
-            );
-        }
-
         turbulence->correct();
 
         runTime.write();
@@ -107,7 +103,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/CourantNo.H b/applications/solvers/multiphase/rasCavitatingFoam/CourantNo.H
deleted file mode 100644
index b7450c92d..000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/CourantNo.H
+++ /dev/null
@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    CourantNo
-
-Description
-    Calculates and outputs the mean and maximum Courant Numbers.
-
-\*---------------------------------------------------------------------------*/
-
-scalar CoNum = 0.0;
-scalar meanCoNum = 0.0;
-scalar acousticCoNum = 0.0;
-
-if (mesh.nInternalFaces())
-{
-    surfaceScalarField SfUfbyDelta = 
-        mesh.surfaceInterpolation::deltaCoeffs()*mag(phiv);
-
-    CoNum = max(SfUfbyDelta/mesh.magSf())
-        .value()*runTime.deltaT().value();
-
-    meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
-        .value()*runTime.deltaT().value();
-
-    acousticCoNum = max
-    (
-        mesh.surfaceInterpolation::deltaCoeffs()/sqrt(fvc::interpolate(psi))
-    ).value()*runTime.deltaT().value();
-}
-
-Info<< "phiv Courant Number mean: " << meanCoNum
-    << " max: " << CoNum
-    << " acoustic max: " << acousticCoNum
-    << endl;
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/Make/files b/applications/solvers/multiphase/rasCavitatingFoam/Make/files
deleted file mode 100644
index 450946379..000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-rasCavitatingFoam.C
-
-EXE = $(FOAM_APPBIN)/rasCavitatingFoam
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/continuityErrs.H b/applications/solvers/multiphase/rasCavitatingFoam/continuityErrs.H
deleted file mode 100644
index 6f1622510..000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/continuityErrs.H
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    volScalarField thermoRho = psi*p + (1.0 - gamma)*rhol0;
-
-    dimensionedScalar totalMass = fvc::domainIntegrate(rho);
-
-    scalar sumLocalContErr = 
-    (
-        fvc::domainIntegrate(mag(rho - thermoRho))/totalMass
-    ).value();
-
-    scalar globalContErr = 
-    (
-        fvc::domainIntegrate(rho - thermoRho)/totalMass
-    ).value();
-
-    cumulativeContErr += globalContErr;
-
-    Info<< "time step continuity errors : sum local = " << sumLocalContErr
-        << ", global = " << globalContErr
-        << ", cumulative = " << cumulativeContErr
-        << endl;
-}
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/gammaPsi.H b/applications/solvers/multiphase/rasCavitatingFoam/gammaPsi.H
deleted file mode 100644
index b259ddd32..000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/gammaPsi.H
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    gamma = max(min((rho - rholSat)/(rhovSat - rholSat), scalar(1)), scalar(0));
-
-    Info<< "max-min gamma: " << max(gamma).value()
-        << " " << min(gamma).value() << endl;
-
-    psiModel->correct();
-
-    //Info<< "min a: " << 1.0/sqrt(max(psi)).value() << endl;
-}
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/readControls.H b/applications/solvers/multiphase/rasCavitatingFoam/readControls.H
deleted file mode 100644
index f53e7b9eb..000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/readControls.H
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "readTimeControls.H"
-
-scalar maxAcousticCo
-(
-    readScalar(runTime.controlDict().lookup("maxAcousticCo"))
-);
-
-
-#include "readPISOControls.H"
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/readThermodynamicProperties.H b/applications/solvers/multiphase/rasCavitatingFoam/readThermodynamicProperties.H
deleted file mode 100644
index d3fbb9307..000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/readThermodynamicProperties.H
+++ /dev/null
@@ -1,27 +0,0 @@
-    Info<< "Reading thermodynamicProperties\n" << endl;
-
-    IOdictionary thermodynamicProperties
-    (
-        IOobject
-        (
-            "thermodynamicProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        )
-    );
-
-    dimensionedScalar psil(thermodynamicProperties.lookup("psil"));
-
-    dimensionedScalar rholSat(thermodynamicProperties.lookup("rholSat"));
-
-    dimensionedScalar psiv(thermodynamicProperties.lookup("psiv"));
-
-    dimensionedScalar pSat(thermodynamicProperties.lookup("pSat"));
-
-    dimensionedScalar rhovSat("rhovSat", psiv*pSat);
-
-    dimensionedScalar rhol0("rhol0", rholSat - pSat*psil);
-
-    dimensionedScalar rhoMin(thermodynamicProperties.lookup("rhoMin"));
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/resetPhiPatches.H b/applications/solvers/multiphase/rasCavitatingFoam/resetPhiPatches.H
deleted file mode 100644
index e7d0c2f93..000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/resetPhiPatches.H
+++ /dev/null
@@ -1,15 +0,0 @@
-fvsPatchScalarFieldField& phiPatches = phi.boundaryField();
-const fvPatchScalarFieldField& rhoPatches = rho.boundaryField();
-const fvPatchVectorFieldField& Upatches = U.boundaryField();
-const fvsPatchVectorFieldField& SfPatches = mesh.Sf().boundaryField();
-
-forAll(phiPatches, patchI)
-{
-    if (phi.boundaryField().types()[patchI] == "calculated")
-    {
-        calculatedFvsPatchScalarField& phiPatch =
-            refCast<calculatedFvsPatchScalarField>(phiPatches[patchI]);
-
-        phiPatch == ((rhoPatches[patchI]*Upatches[patchI]) & SfPatches[patchI]);
-    }
-}
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/resetPhivPatches.H b/applications/solvers/multiphase/rasCavitatingFoam/resetPhivPatches.H
deleted file mode 100644
index 7e8b040bb..000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/resetPhivPatches.H
+++ /dev/null
@@ -1,14 +0,0 @@
-surfaceScalarField::GeometricBoundaryField& phivPatches = phiv.boundaryField();
-const volVectorField::GeometricBoundaryField& Upatches = U.boundaryField();
-const surfaceVectorField::GeometricBoundaryField& SfPatches = mesh.Sf().boundaryField();
-
-forAll(phivPatches, patchI)
-{
-    if (phiv.boundaryField().types()[patchI] == "calculated")
-    {
-        calculatedFvsPatchScalarField& phivPatch =
-            refCast<calculatedFvsPatchScalarField>(phivPatches[patchI]);
-
-        phivPatch == (Upatches[patchI] & SfPatches[patchI]);
-    }
-}
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/rhoEqn.H b/applications/solvers/multiphase/rasCavitatingFoam/rhoEqn.H
deleted file mode 100644
index d0bd6e1da..000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/rhoEqn.H
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    fvScalarMatrix rhoEqn
-    (
-        fvm::ddt(rho)
-      + fvm::div(phiv, rho)
-    );
-
-    rhoEqn.solve();
-
-    phi = rhoEqn.flux();
-
-    Info<< "max-min rho: " << max(rho).value()
-        << " " << min(rho).value() << endl;
-
-    rho == max(rho, rhoMin);
-}
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/setDeltaT.H b/applications/solvers/multiphase/rasCavitatingFoam/setDeltaT.H
deleted file mode 100644
index 9233804c4..000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/setDeltaT.H
+++ /dev/null
@@ -1,54 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    setDeltaT
-
-Description
-    Reset the timestep to maintain a constant maximum courant Number.
-    Reduction of time-step is imediate but increase is damped to avoid
-    unstable oscillations.
-
-\*---------------------------------------------------------------------------*/
-
-if (adjustTimeStep)
-{
-    scalar maxDeltaTFact =
-        min(maxCo/(CoNum + SMALL), maxAcousticCo/(acousticCoNum + SMALL));
-
-    scalar deltaTFact = min(min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);
-
-    runTime.setDeltaT
-    (
-        min
-        (
-            deltaTFact*runTime.deltaT().value(),
-            maxDeltaT
-        )
-    );
-    
-    Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
-}
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/setInitialDeltaT.H b/applications/solvers/multiphase/rasCavitatingFoam/setInitialDeltaT.H
deleted file mode 100644
index 61823a001..000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/setInitialDeltaT.H
+++ /dev/null
@@ -1,54 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    setInitialDeltaT
-
-Description
-    Set the initial timestep corresponding to the timestep adjustment
-    algorithm in setDeltaT
-
-\*---------------------------------------------------------------------------*/
-
-if (adjustTimeStep)
-{
-#   include "CourantNo.H"
-
-    if (CoNum > SMALL)
-    {
-        scalar maxDeltaTFact =
-            min(maxCo/(CoNum + SMALL), maxAcousticCo/(acousticCoNum + SMALL));
-
-        runTime.setDeltaT
-        (
-            min
-            (
-                maxDeltaTFact*runTime.deltaT().value(),
-                maxDeltaT
-            )
-        );
-    }
-}
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/rasInterFoam/Make/files b/applications/solvers/multiphase/rasInterFoam/Make/files
deleted file mode 100644
index 39b992ad4..000000000
--- a/applications/solvers/multiphase/rasInterFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-rasInterFoam.C
-
-EXE = $(FOAM_APPBIN)/rasInterFoam
diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
index b6a464c1d..072e92794 100644
--- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C
+++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
@@ -43,12 +43,11 @@ Description
 
 int main(int argc, char *argv[])
 {
-
 #   include "setRootCase.H"
 
 #   include "createTime.H"
 #   include "createMesh.H"
-#   include "readEnvironmentalProperties.H"
+#   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 
@@ -57,7 +56,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    for (runTime++; !runTime.end(); runTime++)
+    while (runTime.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
@@ -66,22 +65,24 @@ int main(int argc, char *argv[])
 
 #       include "rhoEqn.H"
 
-#       include "calcVdj.H"
-
-#       include "UEqn.H"
-
-#       include "alphaEqn.H"
-
-#       include "correctViscosity.H"
-
-
-        // --- PISO loop
-        for (int corr=0; corr<nCorr; corr++)
+        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
         {
-#           include "pEqn.H"
-        }
+#           include "calcVdj.H"
 
-#       include "kEpsilon.H"
+#           include "UEqn.H"
+
+#           include "alphaEqn.H"
+
+#           include "correctViscosity.H"
+
+            // --- PISO loop
+            for (int corr=0; corr<nCorr; corr++)
+            {
+#               include "pEqn.H"
+            }
+
+#           include "kEpsilon.H"
+        }
 
         runTime.write();
 
@@ -92,7 +93,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
index 376c09beb..0e21fc2d6 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
@@ -2,10 +2,12 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -linterfaceProperties \
     -lincompressibleTransportModels \
-    -lfiniteVolume \
-    -llduSolvers
+    -lincompressibleRASModels \
+    -lincompressibleLESModels \
+    -lfiniteVolume
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
index 0ebaec44f..61bab2678 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
@@ -1,23 +1,38 @@
-    surfaceScalarField muf = twoPhaseProperties.muf();
+    surfaceScalarField muEff
+    (
+        "muEff",
+        twoPhaseProperties.muf()
+      + fvc::interpolate(rho*turbulence->nut())
+    );
 
     fvVectorMatrix UEqn
     (
         fvm::ddt(rho, U)
       + fvm::div(rhoPhi, U)
-      - fvm::laplacian(muf, U)
-        //- (fvc::grad(U) & fvc::grad(muf))
-      - fvc::div(muf*(mesh.Sf() & fvc::interpolate(fvc::grad(U)().T())))
+      - fvm::laplacian(muEff, U)
+      - (fvc::grad(U) & fvc::grad(muEff))
+    //- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
     );
 
+    if (oCorr == nOuterCorr-1)
+    {
+        UEqn.relax(1);
+    }
+    else
+    {
+        UEqn.relax();
+    }
+
     if (momentumPredictor)
     {
         solve
         (
             UEqn
          ==
-           -fvc::reconstruct
+            fvc::reconstruct
             (
-                mesh.magSf()*(fvc::snGrad(pd) + ghf*fvc::snGrad(rho))
-            )
+                (- ghf*fvc::snGrad(rho) - fvc::snGrad(p_rgh))*mesh.magSf()
+            ),
+            mesh.solver(oCorr == nOuterCorr-1 ? "UFinal" : "U")
         );
     }
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
new file mode 100644
index 000000000..8194753c8
--- /dev/null
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
@@ -0,0 +1,24 @@
+{
+    fvScalarMatrix alpha1Eqn
+    (
+        fvm::ddt(alpha1)
+      + fvm::div(phi, alpha1)
+      //- fvm::Sp(fvc::div(phi), alpha1)
+      - fvm::laplacian
+        (
+            Dab + alphatab*turbulence->nut(), alpha1,
+            "laplacian(Dab,alpha1)"
+        )
+    );
+
+    alpha1Eqn.solve();
+
+    rhoPhi = alpha1Eqn.flux()*(rho1 - rho2) + phi*rho2;
+    rho = alpha1*rho1 + (scalar(1) - alpha1)*rho2;
+
+    Info<< "Phase 1 volume fraction = "
+        << alpha1.weightedAverage(mesh.V()).value()
+        << "  Min(alpha1) = " << min(alpha1).value()
+        << "  Max(alpha1) = " << max(alpha1).value()
+        << endl;
+}
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
index 652d1ad64..7cd78a521 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
@@ -1,9 +1,9 @@
-    Info<< "Reading field pd\n" << endl;
-    volScalarField pd
+    Info<< "Reading field p_rgh\n" << endl;
+    volScalarField p_rgh
     (
         IOobject
         (
-            "pd",
+            "p_rgh",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -12,12 +12,12 @@
         mesh
     );
 
-    Info<< "Reading field gamma\n" << endl;
-    volScalarField gamma
+    Info<< "Reading field alpha1\n" << endl;
+    volScalarField alpha1
     (
         IOobject
         (
-            "gamma",
+            "alpha1",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -40,24 +40,27 @@
         mesh
     );
 
-#   include "createPhi.H"
+    #include "createPhi.H"
 
     Info<< "Reading transportProperties\n" << endl;
-    twoPhaseMixture twoPhaseProperties(U, phi, "gamma");
-    
+    twoPhaseMixture twoPhaseProperties(U, phi);
+
     const dimensionedScalar& rho1 = twoPhaseProperties.rho1();
     const dimensionedScalar& rho2 = twoPhaseProperties.rho2();
 
     dimensionedScalar Dab(twoPhaseProperties.lookup("Dab"));
 
+    // Read the reciprocal of the turbulent Schmidt number
+    dimensionedScalar alphatab(twoPhaseProperties.lookup("alphatab"));
+
     // Need to store rho for ddt(rho, U)
-    volScalarField rho("rho", gamma*rho1 + (scalar(1) - gamma)*rho2);
+    volScalarField rho("rho", alpha1*rho1 + (scalar(1) - alpha1)*rho2);
     rho.oldTime();
 
 
     // Mass flux
     // Initialisation does not matter because rhoPhi is reset after the
-    // gamma solution before it is used in the U equation.
+    // alpha1 solution before it is used in the U equation.
     surfaceScalarField rhoPhi
     (
         IOobject
@@ -71,11 +74,53 @@
         rho1*phi
     );
 
+    Info<< "Calculating field (g.h)f\n" << endl;
+    volScalarField gh("gh", g & mesh.C());
+    surfaceScalarField ghf = surfaceScalarField("gh", g & mesh.Cf());
 
-    Info<< "Calculating field g.h\n" << endl;
-    surfaceScalarField ghf("gh", g & mesh.Cf());
+    volScalarField p
+    (
+        IOobject
+        (
+            "p",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        p_rgh + rho*gh
+    );
+
+    label p_rghRefCell = 0;
+    scalar p_rghRefValue = 0.0;
+    setRefCell
+    (
+        p_rgh,
+        mesh.solutionDict().subDict("PIMPLE"),
+        p_rghRefCell,
+        p_rghRefValue
+    );
+
+    scalar pRefValue = 0.0;
+
+    if (p_rgh.needReference())
+    {
+        pRefValue = readScalar
+        (
+            mesh.solutionDict().subDict("PIMPLE").lookup("pRefValue")
+        );
+
+        p += dimensionedScalar
+        (
+            "p",
+            p.dimensions(),
+            pRefValue - getRefCellValue(p, p_rghRefCell)
+        );
+    }
 
 
-    label pdRefCell = 0;
-    scalar pdRefValue = 0.0;
-    setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
+    // Construct incompressible turbulence model
+    autoPtr<incompressible::turbulenceModel> turbulence
+    (
+        incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
+    );
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/gammaEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/gammaEqn.H
deleted file mode 100644
index 144339f39..000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/gammaEqn.H
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    fvScalarMatrix gammaEqn
-    (
-        fvm::ddt(gamma)
-      + fvm::div(phi, gamma)
-      - fvm::laplacian(Dab, gamma)
-    );
-
-    gammaEqn.solve();
-
-    rhoPhi = gammaEqn.flux()*(rho1 - rho2) + phi*rho2;
-    rho = gamma*rho1 + (scalar(1) - gamma)*rho2;
-
-    Info<< "Phase 1 volume fraction = "
-        << gamma.weightedAverage(mesh.V()).value()
-        << "  Min(gamma) = " << min(gamma).value()
-        << "  Max(gamma) = " << max(gamma).value()
-        << endl;
-}
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
deleted file mode 100644
index eaa0cef62..000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    volScalarField rUA = 1.0/UEqn.A();
-    surfaceScalarField rUAf = fvc::interpolate(rUA);
-
-    U = rUA*UEqn.H();
-
-    surfaceScalarField phiU
-    (
-        "phiU",
-        (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi)
-    );
-
-    phi = phiU - ghf*fvc::snGrad(rho)*rUAf*mesh.magSf();
-
-    adjustPhi(phi, U, pd);
-
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-    {
-        fvScalarMatrix pdEqn
-        (
-            fvm::laplacian(rUAf, pd) == fvc::div(phi)
-        );
-
-        pdEqn.setReference(pdRefCell, pdRefValue);
-        pdEqn.solve();
-
-        if (nonOrth == nNonOrthCorr)
-        {
-            phi -= pdEqn.flux();
-        }
-    }
-
-    U += rUA*fvc::reconstruct((phi - phiU)/rUAf);
-    U.correctBoundaryConditions();
-}
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/p_rghEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/p_rghEqn.H
new file mode 100644
index 000000000..6e12b0478
--- /dev/null
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/p_rghEqn.H
@@ -0,0 +1,56 @@
+{
+    volScalarField rUA = 1.0/UEqn.A();
+    surfaceScalarField rUAf = fvc::interpolate(rUA);
+
+    U = rUA*UEqn.H();
+
+    surfaceScalarField phiU
+    (
+        "phiU",
+        (fvc::interpolate(U) & mesh.Sf())
+      + fvc::ddtPhiCorr(rUA, rho, U, phi)
+    );
+
+    phi = phiU - ghf*fvc::snGrad(rho)*rUAf*mesh.magSf();
+
+    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    {
+        fvScalarMatrix p_rghEqn
+        (
+            fvm::laplacian(rUAf, p_rgh) == fvc::div(phi)
+        );
+
+        p_rghEqn.setReference(p_rghRefCell, p_rghRefValue);
+
+        p_rghEqn.solve
+        (
+            mesh.solver
+            (
+                p_rgh.name()
+              + ((corr == nCorr-1 && nonOrth == nNonOrthCorr) ? "Final" : "")
+            )
+        );
+
+        if (nonOrth == nNonOrthCorr)
+        {
+            phi -= p_rghEqn.flux();
+        }
+    }
+
+    p == p_rgh + rho*gh;
+
+    if (p_rgh.needReference())
+    {
+        p += dimensionedScalar
+        (
+            "p",
+            p.dimensions(),
+            pRefValue - getRefCellValue(p, p_rghRefCell)
+        );
+    }
+
+    #include "continuityErrs.H"
+
+    U += rUA*fvc::reconstruct((phi - phiU)/rUAf);
+    U.correctBoundaryConditions();
+}
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index 6f3174dc3..69caf3deb 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -28,47 +28,61 @@ Application
 Description
     Solver for mixing 2 incompressible fluids.
 
+    Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
+
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "twoPhaseMixture.H"
+#include "turbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
-
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
-#   include "readEnvironmentalProperties.H"
+#   include "readGravitationalAcceleration.H"
+#   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
+#   include "readTimeControls.H"
+#   include "CourantNo.H"
+#   include "setInitialDeltaT.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
-    for (runTime++; !runTime.end(); runTime++)
+    while (runTime.run())
     {
+#       include "readPIMPLEControls.H"
+#       include "readTimeControls.H"
+#       include "CourantNo.H"
+#       include "setDeltaT.H"
+
+        runTime++;
+
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPISOControls.H"
-#       include "CourantNo.H"
-
-        twoPhaseProperties.correct();
-
-#       include "gammaEqn.H"
-
-#       include "UEqn.H"
-
-        // --- PISO loop
-        for (int corr=0; corr<nCorr; corr++)
+        // --- Pressure-velocity PIMPLE corrector loop
+        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
         {
-#           include "pEqn.H"
-        }
+            twoPhaseProperties.correct();
 
-#       include "continuityErrs.H"
+#           include "alphaEqn.H"
+
+#           include "UEqn.H"
+
+            // --- PISO loop
+            for (int corr=0; corr<nCorr; corr++)
+            {
+#               include "p_rghEqn.H"
+            }
+
+            turbulence->correct();
+        }
 
         runTime.write();
 
@@ -79,7 +93,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index b809e491a..292ff8046 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -47,12 +47,11 @@ Description
 
 int main(int argc, char *argv[])
 {
-
 #   include "setRootCase.H"
 
 #   include "createTime.H"
 #   include "createMesh.H"
-#   include "readEnvironmentalProperties.H"
+#   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "readPPProperties.H"
 #   include "initContinuityErrs.H"
@@ -108,7 +107,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/newStressAnalysis/Allwmake b/applications/solvers/newStressAnalysis/Allwmake
index 61fce76ac..965c9fc2d 100755
--- a/applications/solvers/newStressAnalysis/Allwmake
+++ b/applications/solvers/newStressAnalysis/Allwmake
@@ -1,4 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
 set -x
 
 wmake libso materialModels
diff --git a/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C b/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C
index 5a4b452c0..2ea3e3a7d 100644
--- a/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C
+++ b/applications/solvers/newStressAnalysis/materialModels/cohesiveLaws/cohesiveLaw/cohesiveLaw.C
@@ -104,7 +104,7 @@ Foam::cohesiveLaw::~cohesiveLaw()
 
 void Foam::cohesiveLaw::writeDict(Ostream& os) const
 {
-    os.writeKeyword(type() + "Coeffs") 
+    os.writeKeyword(word(type() + "Coeffs"))
         << cohesiveLawCoeffs();
 }
 
diff --git a/applications/solvers/newStressAnalysis/newContactStressFoam/newContactStressFoam.C b/applications/solvers/newStressAnalysis/newContactStressFoam/newContactStressFoam.C
index f51d9ba12..5086cf4b7 100644
--- a/applications/solvers/newStressAnalysis/newContactStressFoam/newContactStressFoam.C
+++ b/applications/solvers/newStressAnalysis/newContactStressFoam/newContactStressFoam.C
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
     // Force n-sqaured projection
 //     polyPatch::setNSquaredProjection(true);
 
-    for (runTime++; !runTime.end(); runTime++)
+    while (runTime.loop())
     {
         Info<< "Iteration: " << runTime.timeName() << nl << endl;
 
diff --git a/applications/solvers/newStressAnalysis/newStressedFoam/newStressedFoam.C b/applications/solvers/newStressAnalysis/newStressedFoam/newStressedFoam.C
index 7c440eeba..68420167a 100644
--- a/applications/solvers/newStressAnalysis/newStressedFoam/newStressedFoam.C
+++ b/applications/solvers/newStressAnalysis/newStressedFoam/newStressedFoam.C
@@ -52,11 +52,11 @@ int main(int argc, char *argv[])
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nCalculating displacement field\n" << endl;
- 
+
     volTensorField gradU = fvc::grad(U);
     volScalarField rho = rheology.rho();
 
-    for (runTime++; !runTime.end(); runTime++)
+    while (runTime.loop())
     {
         Info<< "Iteration: " << runTime.timeName() << nl << endl;
 
diff --git a/applications/solvers/stressAnalysis/icoFsiFoam/createFields.H b/applications/solvers/stressAnalysis/icoFsiFoam/createFields.H
index b772ed7d5..0e1e4a701 100644
--- a/applications/solvers/stressAnalysis/icoFsiFoam/createFields.H
+++ b/applications/solvers/stressAnalysis/icoFsiFoam/createFields.H
@@ -12,13 +12,11 @@
         )
     );
 
-
     dimensionedScalar nu
     (
         transportProperties.lookup("nu")
     );
 
-
     dimensionedScalar rhoFluid
     (
         transportProperties.lookup("rho")
@@ -56,11 +54,6 @@
 
 #   include "createPhi.H"
 
-
-//     surfaceScalarField phiNet = phi;
-//     phiNet.rename("phiNet");
-
-
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
diff --git a/applications/solvers/stressAnalysis/icoFsiFoam/createStressMesh.H b/applications/solvers/stressAnalysis/icoFsiFoam/createStressMesh.H
index bfcb4eb27..e9a081363 100644
--- a/applications/solvers/stressAnalysis/icoFsiFoam/createStressMesh.H
+++ b/applications/solvers/stressAnalysis/icoFsiFoam/createStressMesh.H
@@ -9,11 +9,5 @@
         )
     );
 
-    pointMesh pStressMesh(stressMesh);
-
-    volPointInterpolation cpi
-    (
-        stressMesh,
-        pStressMesh
-    );
+    const volPointInterpolation& cpi = volPointInterpolation::New(stressMesh);
 
diff --git a/applications/solvers/stressAnalysis/icoFsiFoam/icoFsiFoam.C b/applications/solvers/stressAnalysis/icoFsiFoam/icoFsiFoam.C
index d0285f34c..a1a3ee468 100644
--- a/applications/solvers/stressAnalysis/icoFsiFoam/icoFsiFoam.C
+++ b/applications/solvers/stressAnalysis/icoFsiFoam/icoFsiFoam.C
@@ -26,9 +26,9 @@ Application
     icoFoam
 
 Description
-    Transient solver for incompressible, laminar flow of Newtonian fluids with 
+    Transient solver for incompressible, laminar flow of Newtonian fluids with
     mesh motion.  Set up as a fake fluid structure interaction solver
-    
+
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index 99af2c373..3ca753d9a 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -86,21 +86,25 @@ void checkSnapMesh
 
     // Max nonorthogonality allowed
     scalar maxNonOrtho(readScalar(snapDict.lookup("maxNonOrtho")));
+    primitiveMesh::nonOrthThreshold_ = maxNonOrtho;
+
     // Max concaveness allowed.
     scalar maxConcave(readScalar(snapDict.lookup("maxConcave")));
+    primitiveMesh::faceAngleThreshold_ = maxConcave;
+
     // Min volume allowed (factor of minimum cellVolume)
     scalar relMinVol(readScalar(snapDict.lookup("minVol")));
     const scalar minCellVol = min(mesh.cellVolumes());
     const scalar minPyrVol = relMinVol*minCellVol;
+
     // Min area
     scalar minArea(readScalar(snapDict.lookup("minArea")));
 
-    if (maxNonOrtho < 180.0-SMALL)
+    if (maxNonOrtho < 180.0 - SMALL)
     {
         Pout<< "Checking non orthogonality" << endl;
 
         label nOldSize = wrongFaces.size();
-        mesh.setNonOrthThreshold(maxNonOrtho);
         mesh.checkFaceOrthogonality(false, &wrongFaces);
 
         Pout<< "Detected " << wrongFaces.size() - nOldSize
@@ -123,7 +127,8 @@ void checkSnapMesh
         Pout<< "Checking face angles" << endl;
 
         label nOldSize = wrongFaces.size();
-        mesh.checkFaceAngles(false, maxConcave, &wrongFaces);
+        mesh.checkFaceAngles(false, &wrongFaces);
+
         Pout<< "Detected additional " << wrongFaces.size() - nOldSize
             << " faces with concavity > " << maxConcave << " degrees"
             << endl;
@@ -144,6 +149,7 @@ void checkSnapMesh
                 wrongFaces.insert(faceI);
             }
         }
+
         Pout<< "Detected additional " << wrongFaces.size() - nOldSize
             << " faces with area < " << minArea << " m^2" << endl;
     }
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
index d9cc48307..39c28bf28 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
+++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
@@ -164,7 +164,6 @@ int main(int argc, char *argv[])
 
     // Update fields
     mesh.updateMesh(map);
-    pMesh.updateMesh(map);
 
     // Update numbering of cells/vertices.
     meshCutter.updateMesh(map);
@@ -173,11 +172,11 @@ int main(int argc, char *argv[])
     if (map().hasMotionPoints())
     {
         mesh.movePoints(map().preMotionPoints());
-        pMesh.movePoints(map().preMotionPoints());
     }
 
     Pout<< "Refined from " << returnReduce(map().nOldCells(), sumOp<label>())
-        << " to " << mesh.globalData().nTotalCells() << " cells." << nl << endl;
+        << " to " << mesh.globalData().nTotalCells() << " cells."
+        << nl << endl;
 
     if (overwrite)
     {
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index e7e14ec6f..fd42d51fe 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -39,6 +39,8 @@ Description
  \* ------------------------------------------------------------------------- */
 
 #include <sstream>
+// For EOF only
+#include <cstdio>
 
 #include "scalar.H"
 #include "IStringStream.H"
@@ -278,7 +280,7 @@ int main(int argc, char *argv[])
     )
     {
         // Scale points for the given scale factor
-        points[i++] = scaleFactor*pointIter();
+        points[i++] = scaleFactor * pointIter();
     }
 
 
@@ -476,7 +478,7 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        points,
+        xferMove(points),
         cellShapes,
         boundary,
         patchNames,
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index 42f42777d..c44689869 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -724,7 +724,7 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        points,
+        xferMove(points),
         cellShapes,
         boundary,
         patchNames,
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
index 2852f53cf..7520a42cf 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
@@ -30,7 +30,7 @@ Class
 #include "meshDualiser.H"
 #include "meshTools.H"
 #include "polyMesh.H"
-#include "polyTopoChange.H"
+#include "directTopoChange.H"
 #include "mapPolyMesh.H"
 #include "edgeFaceCirculator.H"
 #include "mergePoints.H"
@@ -43,7 +43,7 @@ defineTypeNameAndDebug(Foam::meshDualiser, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::meshDualiser::checkPolyTopoChange(const polyTopoChange& meshMod)
+void Foam::meshDualiser::checkPolyTopoChange(const directTopoChange& meshMod)
 {
     // Assume no removed points
     pointField points(meshMod.points().size());
@@ -73,7 +73,7 @@ void Foam::meshDualiser::checkPolyTopoChange(const polyTopoChange& meshMod)
             {
                 FatalErrorIn
                 (
-                    "meshDualiser::checkPolyTopoChange(const polyTopoChange&)"
+                    "meshDualiser::checkPolyTopoChange(const directTopoChange&)"
                 )   << "duplicate verts:" << newToOld[newI]
                     << " coords:"
                     << UIndirectList<point>(points, newToOld[newI])()
@@ -87,14 +87,14 @@ void Foam::meshDualiser::checkPolyTopoChange(const polyTopoChange& meshMod)
 // Dump state so far.
 void Foam::meshDualiser::dumpPolyTopoChange
 (
-    const polyTopoChange& meshMod,
+    const directTopoChange& meshMod,
     const fileName& prefix
 )
 {
     OFstream str1(prefix + "Faces.obj");
     OFstream str2(prefix + "Edges.obj");
 
-    Info<< "Dumping current polyTopoChange. Faces to " << str1.name()
+    Info<< "Dumping current directTopoChange. Faces to " << str1.name()
         << " , points and edges to " << str2.name() << endl;
 
     const DynamicList<point>& points = meshMod.points();
@@ -157,7 +157,7 @@ void Foam::meshDualiser::generateDualBoundaryEdges
 (
     const PackedBoolList& isBoundaryEdge,
     const label pointI,
-    polyTopoChange& meshMod
+    directTopoChange& meshMod
 )
 {
     const labelList& pEdges = mesh_.pointEdges()[pointI];
@@ -214,7 +214,7 @@ Foam::label Foam::meshDualiser::addInternalFace
     const label dualCell0,
     const label dualCell1,
     const DynamicList<label>& verts,
-    polyTopoChange& meshMod
+    directTopoChange& meshMod
 ) const
 {
     face newFace(verts);
@@ -332,7 +332,7 @@ Foam::label Foam::meshDualiser::addBoundaryFace
     const label dualCellI,
     const label patchI,
     const DynamicList<label>& verts,
-    polyTopoChange& meshMod
+    directTopoChange& meshMod
 ) const
 {
     face newFace(verts);
@@ -388,7 +388,7 @@ void Foam::meshDualiser::createFacesAroundEdge
     const PackedBoolList& isBoundaryEdge,
     const label edgeI,
     const label startFaceI,
-    polyTopoChange& meshMod,
+    directTopoChange& meshMod,
     boolList& doneEFaces
 ) const
 {
@@ -555,7 +555,7 @@ void Foam::meshDualiser::createFaceFromInternalFace
 (
     const label faceI,
     label& fp,
-    polyTopoChange& meshMod
+    directTopoChange& meshMod
 ) const
 {
     const face& f = mesh_.faces()[faceI];
@@ -654,7 +654,7 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
     const label patchI,
     const label patchPointI,
     const label startFaceI,
-    polyTopoChange& meshMod,
+    directTopoChange& meshMod,
     boolList& donePFaces            // pFaces visited
 ) const
 {
@@ -894,7 +894,7 @@ void Foam::meshDualiser::setRefinement
     const labelList& featureEdges,
     const labelList& singleCellFeaturePoints,
     const labelList& multiCellFeaturePoints,
-    polyTopoChange& meshMod
+    directTopoChange& meshMod
 )
 {
     const labelList& own = mesh_.faceOwner();
@@ -938,7 +938,7 @@ void Foam::meshDualiser::setRefinement
             (
                 "meshDualiser::setRefinement"
                 "(const labelList&, const labelList&, const labelList&"
-                ", const labelList, polyTopoChange&)"
+                ", const labelList, directTopoChange&)"
             )   << "In split-face-mode (splitFace=true) but not all faces"
                 << " marked as feature faces." << endl
                 << "First conflicting face:" << faceI
@@ -960,7 +960,7 @@ void Foam::meshDualiser::setRefinement
             (
                 "meshDualiser::setRefinement"
                 "(const labelList&, const labelList&, const labelList&"
-                ", const labelList, polyTopoChange&)"
+                ", const labelList, directTopoChange&)"
             )   << "In split-face-mode (splitFace=true) but not all edges"
                 << " marked as feature edges." << endl
                 << "First conflicting edge:" << edgeI
@@ -991,7 +991,7 @@ void Foam::meshDualiser::setRefinement
                 (
                     "meshDualiser::setRefinement"
                     "(const labelList&, const labelList&, const labelList&"
-                    ", const labelList, polyTopoChange&)"
+                    ", const labelList, directTopoChange&)"
                 )   << "Not all boundary faces marked as feature faces."
                     << endl
                     << "First conflicting face:" << faceI
@@ -1083,7 +1083,7 @@ void Foam::meshDualiser::setRefinement
             (
                 "meshDualiser::setRefinement"
                 "(const labelList&, const labelList&, const labelList&"
-                ", const labelList, polyTopoChange&)"
+                ", const labelList, directTopoChange&)"
             )   << "Point " << pointI << " at:" << mesh_.points()[pointI]
                 << " is both in singleCellFeaturePoints"
                 << " and multiCellFeaturePoints."
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
index ef929f038..fba7b0eab 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
+++ b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
@@ -29,9 +29,9 @@ Description
     Creates dual of polyMesh. Every point becomes a cell (or multiple cells
     for feature points), a walk around every edge creates faces between them.
 
-    Put all points you want in the final mesh into featurePoints; all edge(mid)s
-    you want in the final mesh into featureEdges; all face(centre)s in
-    faceFaces.
+    Put all points you want in the final mesh into featurePoints;
+    all edge(mid)s you want in the final mesh into featureEdges;
+    all face(centre)s in faceFaces.
 
     Usually to preserve boundaries:
         - all boundary faces are featureFaces
@@ -59,7 +59,7 @@ namespace Foam
 {
 
 class polyMesh;
-class polyTopoChange;
+class directTopoChange;
 
 /*---------------------------------------------------------------------------*\
                            Class meshDualiser Declaration
@@ -90,9 +90,9 @@ class meshDualiser
 
     // Private Member Functions
 
-        static void checkPolyTopoChange(const polyTopoChange&);
+        static void checkPolyTopoChange(const directTopoChange&);
 
-        static void dumpPolyTopoChange(const polyTopoChange&, const fileName&);
+        static void dumpPolyTopoChange(const directTopoChange&, const fileName&);
 
         //- Find dual cell given point and cell
         label findDualCell(const label cellI, const label pointI) const;
@@ -103,7 +103,7 @@ class meshDualiser
         (
             const PackedBoolList&,
             const label pointI,
-            polyTopoChange&
+            directTopoChange&
         );
 
         //- Check that owner and neighbour of face have same dual cell
@@ -124,7 +124,7 @@ class meshDualiser
             const label dualCell0,
             const label dualCell1,
             const DynamicList<label>& verts,
-            polyTopoChange& meshMod
+            directTopoChange& meshMod
         ) const;
 
         //- Add boundary face
@@ -137,7 +137,7 @@ class meshDualiser
             const label dualCellI,
             const label patchI,
             const DynamicList<label>& verts,
-            polyTopoChange& meshMod
+            directTopoChange& meshMod
         ) const;
 
         //- Create internal faces walking around edge
@@ -147,7 +147,7 @@ class meshDualiser
             const PackedBoolList&,
             const label edgeI,
             const label startFaceI,
-            polyTopoChange&,
+            directTopoChange&,
             boolList& doneEFaces
         ) const;
 
@@ -156,7 +156,7 @@ class meshDualiser
         (
             const label faceI,
             label& fp,
-            polyTopoChange&
+            directTopoChange&
         ) const;
 
         //- Creates boundary faces walking around point on patchI.
@@ -165,7 +165,7 @@ class meshDualiser
             const label patchI,
             const label patchPointI,
             const label startFaceI,
-            polyTopoChange&,
+            directTopoChange&,
             boolList& donePFaces            // pFaces visited
         ) const;
 
@@ -247,7 +247,7 @@ public:
                 const labelList& featureEdges,
                 const labelList& singleCellFeaturePoints,
                 const labelList& multiCellFeaturePoints,
-                polyTopoChange& meshMod
+                directTopoChange& meshMod
             );
 };
 
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
index 6c518bbbd..d5cc3aaca 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
@@ -60,7 +60,7 @@ Usage
 #include "timeSelector.H"
 #include "fvMesh.H"
 #include "mathematicalConstants.H"
-#include "polyTopoChange.H"
+#include "directTopoChange.H"
 #include "mapPolyMesh.H"
 #include "PackedBoolList.H"
 #include "meshTools.H"
@@ -498,13 +498,13 @@ int main(int argc, char *argv[])
 
 
     // Topo change container
-    polyTopoChange meshMod(mesh.boundaryMesh().size());
+    directTopoChange meshMod(mesh.boundaryMesh().size());
 
     // Mesh dualiser engine
     meshDualiser dualMaker(mesh);
 
-    // Insert all commands into polyTopoChange to create dual of mesh. This does
-    // all the hard work.
+    // Insert all commands into directTopoChange to create dual of mesh.
+    // This does all the hard work.
     dualMaker.setRefinement
     (
         splitAllFaces,
diff --git a/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C b/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C
index 10365985f..80cceeded 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C
@@ -47,7 +47,7 @@ void sammMesh::writeMesh()
                 runTime_.constant(),
                 runTime_
             ),
-            points_,
+            xferCopy(points_),           // we could probably re-use the data
             cellShapes_,
             boundary_,
             patchNames_,
@@ -76,9 +76,9 @@ void sammMesh::writeMesh()
                 runTime_.constant(),
                 runTime_
             ),
-            points_,
-            meshFaces_,
-            cellPolys_
+            xferCopy(points_),           // we could probably re-use the data
+            xferCopy(meshFaces_),
+            xferCopy(cellPolys_)
         );
 
         pMesh.addPatches(polyBoundaryPatches(pMesh));
diff --git a/applications/utilities/mesh/conversion/starToFoam/writeMesh.C b/applications/utilities/mesh/conversion/starToFoam/writeMesh.C
index 8bb5fd1f1..e412c6b96 100644
--- a/applications/utilities/mesh/conversion/starToFoam/writeMesh.C
+++ b/applications/utilities/mesh/conversion/starToFoam/writeMesh.C
@@ -51,7 +51,7 @@ void starMesh::writeMesh()
                 runTime_.constant(),
                 runTime_
             ),
-            points_,
+            xferCopy(points_),           // we could probably re-use the data
             cellShapes_,
             boundary_,
             patchNames_,
@@ -82,9 +82,9 @@ void starMesh::writeMesh()
                 runTime_.constant(),
                 runTime_
             ),
-            points_,
-            meshFaces_,
-            cellPolys_
+            xferCopy(points_),           // we could probably re-use the data
+            xferCopy(meshFaces_),
+            xferCopy(cellPolys_)
         );
 
         // adding patches also checks the mesh
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
index 30917b466..06f3225b6 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
@@ -303,7 +303,7 @@ int main(int argc, char *argv[])
         );
 
         // Execute all polyMeshModifiers
-        autoPtr<mapPolyMesh> morphMap = stitcher.changeMesh(true);
+        autoPtr<mapPolyMesh> morphMap = stitcher.changeMesh();
 
         mesh.movePoints(morphMap->preMotionPoints());
     }
diff --git a/applications/utilities/mesh/manipulation/attachMesh/Make/files b/applications/utilities/mesh/manipulation/attachMesh/Make/files
index 3527e5e44..6bd798139 100644
--- a/applications/utilities/mesh/manipulation/attachMesh/Make/files
+++ b/applications/utilities/mesh/manipulation/attachMesh/Make/files
@@ -1,3 +1,4 @@
+attachPolyTopoChanger.C
 attachMesh.C
 
 EXE = $(FOAM_APPBIN)/attachMesh
diff --git a/applications/utilities/mesh/manipulation/attachMesh/attachPolyTopoChanger.C b/applications/utilities/mesh/manipulation/attachMesh/attachPolyTopoChanger.C
new file mode 100644
index 000000000..f7ea25520
--- /dev/null
+++ b/applications/utilities/mesh/manipulation/attachMesh/attachPolyTopoChanger.C
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "attachPolyTopoChanger.H"
+#include "polyMesh.H"
+#include "polyTopoChange.H"
+#include "mapPolyMesh.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::attachPolyTopoChanger::attachPolyTopoChanger
+(
+    const IOobject& io,
+    polyMesh& mesh
+)
+:
+    polyTopoChanger(io, mesh)
+{}
+
+
+Foam::attachPolyTopoChanger::attachPolyTopoChanger
+(
+    polyMesh& mesh
+)
+:
+    polyTopoChanger(mesh)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+//- Attach mesh
+void Foam::attachPolyTopoChanger::attach(const bool removeEmptyPatches)
+{
+    if (debug)
+    {
+        Pout<< "void attachPolyTopoChanger::attach(): "
+            << "Attaching mesh" << endl;
+    }
+
+    // Save current file instance
+    const fileName oldInst = mesh_.facesInstance();
+
+    // Execute all polyMeshModifiers
+    changeMesh();
+
+    const pointField p = mesh_.oldPoints();
+
+    mesh_.movePoints(p);
+
+    if (debug)
+    {
+        Pout << "Clearing mesh." << endl;
+    }
+
+    if (removeEmptyPatches)
+    {
+        // Re-do the boundary patches, removing the ones with zero size
+        const polyBoundaryMesh& oldPatches = mesh_.boundaryMesh();
+
+        List<polyPatch*> newPatches(oldPatches.size());
+        label nNewPatches = 0;
+
+        forAll (oldPatches, patchI)
+        {
+            if (oldPatches[patchI].size())
+            {
+                newPatches[nNewPatches] = oldPatches[patchI].clone
+                (
+                    mesh_.boundaryMesh(),
+                    nNewPatches,
+                    oldPatches[patchI].size(),
+                    oldPatches[patchI].start()
+                ).ptr();
+
+                nNewPatches++;
+            }
+            else
+            {
+                if (debug)
+                {
+                    Pout<< "Removing zero-sized patch " << patchI
+                        << " named " << oldPatches[patchI].name() << endl;
+                }
+            }
+        }
+
+        newPatches.setSize(nNewPatches);
+
+        mesh_.removeBoundary();
+        mesh_.addPatches(newPatches);
+    }
+
+    // Reset the file instance to overwrite the original mesh
+    mesh_.setInstance(oldInst);
+
+    if (debug)
+    {
+        Pout<< "void attachPolyTopoChanger::attach(): "
+            << "Finished attaching mesh" << endl;
+    }
+
+    mesh_.checkMesh();
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H b/applications/utilities/mesh/manipulation/attachMesh/attachPolyTopoChanger.H
similarity index 51%
rename from applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H
rename to applications/utilities/mesh/manipulation/attachMesh/attachPolyTopoChanger.H
index f79257214..5795cd3d4 100644
--- a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H
+++ b/applications/utilities/mesh/manipulation/attachMesh/attachPolyTopoChanger.H
@@ -23,124 +23,85 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    devOneEqEddy
+    Foam::attachPolyTopoChanger
 
 Description
-<pre>
-    One Equation Eddy Viscosity Model
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    Eddy viscosity SGS model using a modeled balance equation to simulate the
-    behaviour of k, hence,
+    This class is derived from polyMesh and serves as a tool for
+    statically connecting pieces of a mesh by executing the mesh
+    modifiers and cleaning the mesh.
 
-        d/dt(k) + div(U*k) - div(nuEff*grad(k))
-        =
-        -B*L - ce*k^3/2/delta
+    The idea is that a mesh can be built from pieces and put together
+    using various mesh modifiers (mainly sliding interfaces) which are
+    not needed during the run.  Therefore, once the mesh is assembled
+    and mesh modification triggered, the newly created point, face and
+    cell zones can be cleared together with the mesh modifiers thus
+    creating a singly connected static mesh.
 
-    and
-
-        B = 2/3*k*I - 2*nuEff*dev(D)
-
-    where
-
-        D = symm(grad(U));
-        nuSgs = ck*sqrt(k)*delta
-        nuEff = nuSgs + nu
-</pre>
-
-SourceFiles
-    devOneEqEddy.C
+    Note:
+    All point, face and cell zoning will be lost!  Do it after
+    attaching the parts of the mesh, as the point, face and cell
+    numbering changes.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef devOneEqEddy_H
-#define devOneEqEddy_H
+#ifndef attachPolyTopoChanger_H
+#define attachPolyTopoChanger_H
 
-#include "GenEddyVisc.H"
+#include "polyTopoChanger.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
-namespace LESModels
-{
 
 /*---------------------------------------------------------------------------*\
-                           Class devOneEqEddy Declaration
+                           Class attachPolyTopoChanger Declaration
 \*---------------------------------------------------------------------------*/
 
-class devOneEqEddy
+class attachPolyTopoChanger
 :
-    public GenEddyVisc
+    public polyTopoChanger
 {
     // Private data
 
-        volScalarField k_;
-
-        dimensionedScalar ck_;
-
-
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        devOneEqEddy(const devOneEqEddy&);
-        devOneEqEddy& operator=(const devOneEqEddy&);
+        //- Disallow default bitwise copy construct
+        attachPolyTopoChanger(const attachPolyTopoChanger&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const attachPolyTopoChanger&);
 
 
 public:
 
-    //- Runtime type information
-    TypeName("devOneEqEddy");
-
     // Constructors
 
-        //- Constructor from components
-        devOneEqEddy
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            transportModel& transport
-        );
+        //- Read constructor from IOobject and a polyMesh
+        attachPolyTopoChanger(const IOobject& io, polyMesh&);
+
+        //- Read constructor for given polyMesh
+        explicit attachPolyTopoChanger(polyMesh&);
 
 
     // Destructor
 
-        ~devOneEqEddy()
+        virtual ~attachPolyTopoChanger()
         {}
 
 
     // Member Functions
 
-        //- Return SGS kinetic energy
-        tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", nuSgs_ + nu())
-            );
-        }
-
-        //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
-
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Attach mesh. By default filter out empty patches.
+        void attach(const bool removeEmptyPatches = true);
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LESModelsModels
-} // End namespace incompressible
 } // End namespace Foam
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index caf5b100d..7dfcedcf0 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -14,7 +14,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
 
     // Check directions
     {
-        Vector<label> dirs = mesh.directions();
+        Vector<label> dirs = mesh.solutionD();
 
         label nValidDirs = 0;
 
@@ -87,7 +87,13 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
 
     {
         cellSet cells(mesh, "nonClosedCells", mesh.nCells()/100 + 1);
-        cellSet aspectCells(mesh, "highAspectRatioCells", mesh.nCells()/100 + 1);
+        cellSet aspectCells
+        (
+            mesh,
+            "highAspectRatioCells",
+            mesh.nCells()/100 + 1
+        );
+
         if (mesh.checkClosedCells(true, &cells, &aspectCells))
         {
             noFailedChecks++;
@@ -241,7 +247,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
     if (allGeometry)
     {
         faceSet faces(mesh, "concaveFaces", mesh.nFaces()/100 + 1);
-        if (mesh.checkFaceAngles(true, 10, &faces))
+        if (mesh.checkFaceAngles(true, &faces))
         {
             //noFailedChecks++;
 
@@ -260,7 +266,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
     if (allGeometry)
     {
         faceSet faces(mesh, "warpedFaces", mesh.nFaces()/100 + 1);
-        if (mesh.checkFaceFlatness(true, 0.8, &faces))
+        if (mesh.checkFaceFlatness(true, &faces))
         {
             //noFailedChecks++;
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C b/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C
index 269656594..cb2fdf3a8 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C
@@ -16,52 +16,6 @@ void Foam::printMeshStats(const polyMesh& mesh, const bool allTopology)
         << "    points:           "
         << returnReduce(mesh.points().size(), sumOp<label>()) << nl;
 
-    label nInternalPoints = returnReduce
-    (
-        mesh.nInternalPoints(),
-        sumOp<label>()
-    );
-
-    if (nInternalPoints != -Pstream::nProcs())
-    {
-        Info<< "    internal points:  " << nInternalPoints << nl;
-
-        if (returnReduce(mesh.nInternalPoints(), minOp<label>()) == -1)
-        {
-            WarningIn("Foam::printMeshStats(const polyMesh&, const bool)")
-                << "Some processors have their points sorted into internal"
-                << " and external and some do not." << endl
-                << "This can cause problems later on." << endl;
-        }
-    }
-
-    if (allTopology && nInternalPoints != -Pstream::nProcs())
-    {
-        label nEdges = returnReduce(mesh.nEdges(), sumOp<label>());
-        label nInternalEdges = returnReduce
-        (
-            mesh.nInternalEdges(),
-            sumOp<label>()
-        );
-        label nInternal1Edges = returnReduce
-        (
-            mesh.nInternal1Edges(),
-            sumOp<label>()
-        );
-        label nInternal0Edges = returnReduce
-        (
-            mesh.nInternal0Edges(),
-            sumOp<label>()
-        );
-
-        Info<< "    edges:            " << nEdges << nl
-            << "    internal edges:   " << nInternalEdges << nl
-            << "    internal edges using one boundary point:   "
-            << nInternal1Edges-nInternal0Edges << nl
-            << "    internal edges using two boundary points:  "
-            << nInternalEdges-nInternal1Edges << nl;
-    }
-
     Info<< "    faces:            "
         << returnReduce(mesh.faces().size(), sumOp<label>()) << nl
         << "    internal faces:   "
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
index 9996a38e4..c992d5f16 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@@ -30,8 +30,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "argList.H"
-#include "Time.H"
+#include "fvCFD.H"
 #include "dynamicFvMesh.H"
 
 using namespace Foam;
@@ -50,14 +49,14 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << endl;
 
-        if (dir(runTime.path()/"VTK"))
+        if (isDir(runTime.path()/"VTK"))
         {
             Info << "Clear VTK directory" << endl;
             rmDir(runTime.path()/"VTK");
         }
 
         mesh.update();
-        
+
 #       include "checkVolContinuity.H"
 
         mesh.checkMesh(true);
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
index ed65d1543..7f4efa773 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -12,7 +12,7 @@ EXE_LIBS = \
     -lerrorEstimation \
     -lfiniteVolume \
     -lforces \
-    -lfvMotionSolvers \
+    -lfvMotionSolver \
     -lincompressibleLESModels \
     -lincompressibleTransportModels \
     -lcompressibleRASModels \
diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H
index 56099e787..542644ce1 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H
+++ b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H
@@ -162,18 +162,20 @@ public:
             const IOobject& fieldIoObject
         );
 
-        //- Reconstruct and write all volume fields
+        //- Reconstruct and write all/selected volume fields
         template<class Type>
         void reconstructFvVolumeFields
         (
-            const IOobjectList& objects
+            const IOobjectList& objects,
+            const HashSet<word>& selectedFields
         );
 
-        //- Reconstruct and write all volume fields
+        //- Reconstruct and write all/selected volume fields
         template<class Type>
         void reconstructFvSurfaceFields
         (
-            const IOobjectList& objects
+            const IOobjectList& objects,
+            const HashSet<word>& selectedFields
         );
 };
 
diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
index 7c81400d3..10defe090 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
@@ -132,7 +132,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
                 forAll(cp, faceI)
                 {
                     // Subtract one to take into account offsets for
-                    // face direction.  
+                    // face direction.
                     reverseAddressing[faceI] = cp[faceI] - 1 - curPatchStart;
                 }
 
@@ -152,7 +152,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
                 forAll(cp, faceI)
                 {
                     // Subtract one to take into account offsets for
-                    // face direction.  
+                    // face direction.
                     label curF = cp[faceI] - 1;
 
                     // Is the face on the boundary?
@@ -192,7 +192,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
         // add empty patches
         if
         (
-            typeid(mesh_.boundary()[patchI]) == typeid(emptyFvPatch)
+            isType<emptyFvPatch>(mesh_.boundary()[patchI])
          && !patchFields(patchI)
         )
         {
@@ -283,7 +283,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
 
         // It is necessary to create a copy of the addressing array to
         // take care of the face direction offset trick.
-        // 
+        //
         {
             labelList curAddr(faceProcAddressing_[procI]);
 
@@ -344,7 +344,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
                 forAll(cp, faceI)
                 {
                     // Subtract one to take into account offsets for
-                    // face direction.  
+                    // face direction.
                     reverseAddressing[faceI] = cp[faceI] - 1 - curPatchStart;
                 }
 
@@ -413,7 +413,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
         // add empty patches
         if
         (
-            typeid(mesh_.boundary()[patchI]) == typeid(emptyFvPatch)
+            isType<emptyFvPatch>(mesh_.boundary()[patchI])
          && !patchFields(patchI)
         )
         {
@@ -454,11 +454,12 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
 }
 
 
-// Reconstruct and write all volume fields
+// Reconstruct and write all/selected volume fields
 template<class Type>
 void Foam::fvFieldReconstructor::reconstructFvVolumeFields
 (
-    const IOobjectList& objects
+    const IOobjectList& objects,
+    const HashSet<word>& selectedFields
 )
 {
     const word& fieldClassName =
@@ -470,27 +471,29 @@ void Foam::fvFieldReconstructor::reconstructFvVolumeFields
     {
         Info<< "    Reconstructing " << fieldClassName << "s\n" << endl;
 
-        for
-        (
-            IOobjectList::const_iterator fieldIter = fields.begin();
-            fieldIter != fields.end();
-            ++fieldIter
-        )
+        forAllConstIter(IOobjectList, fields, fieldIter)
         {
-            Info<< "        " << fieldIter()->name() << endl;
+            if
+            (
+                !selectedFields.size()
+             || selectedFields.found(fieldIter()->name())
+            )
+            {
+                Info<< "        " << fieldIter()->name() << endl;
 
-            reconstructFvVolumeField<Type>(*fieldIter())().write();
+                reconstructFvVolumeField<Type>(*fieldIter())().write();
+            }
         }
-
         Info<< endl;
     }
 }
 
-// Reconstruct and write all surface fields
+// Reconstruct and write all/selected surface fields
 template<class Type>
 void Foam::fvFieldReconstructor::reconstructFvSurfaceFields
 (
-    const IOobjectList& objects
+    const IOobjectList& objects,
+    const HashSet<word>& selectedFields
 )
 {
     const word& fieldClassName =
@@ -502,18 +505,19 @@ void Foam::fvFieldReconstructor::reconstructFvSurfaceFields
     {
         Info<< "    Reconstructing " << fieldClassName << "s\n" << endl;
 
-        for
-        (
-            IOobjectList::const_iterator fieldIter = fields.begin();
-            fieldIter != fields.end();
-            ++fieldIter
-        )
+        forAllConstIter(IOobjectList, fields, fieldIter)
         {
-            Info<< "        " << fieldIter()->name() << endl;
+            if
+            (
+                !selectedFields.size()
+             || selectedFields.found(fieldIter()->name())
+            )
+            {
+                Info<< "        " << fieldIter()->name() << endl;
 
-            reconstructFvSurfaceField<Type>(*fieldIter())().write();
+                reconstructFvSurfaceField<Type>(*fieldIter())().write();
+            }
         }
-
         Info<< endl;
     }
 }
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 0b9f0fcd7..5d7ebc58a 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -474,6 +474,7 @@ int main(int argc, char *argv[])
             {
                 Info << "No lagrangian fields" << nl << endl;
             }
+        }
 
         // If there are any FA fields, reconstruct them
 
@@ -492,7 +493,7 @@ int main(int argc, char *argv[])
             faMesh aMesh(mesh);
 
             processorFaMeshes procFaMeshes(procMeshes.meshes());
-            
+
             faFieldReconstructor faReconstructor
             (
                 aMesh,
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 229e71f2c..5306ac9a2 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -48,7 +48,7 @@ Description
 #include "polyMeshAdder.H"
 #include "faceCoupleInfo.H"
 #include "fvMeshAdder.H"
-#include "polyTopoChange.H"
+#include "directTopoChange.H"
 
 using namespace Foam;
 
@@ -232,7 +232,7 @@ autoPtr<mapPolyMesh> mergeSharedPoints
         return autoPtr<mapPolyMesh>(NULL);
     }
 
-    polyTopoChange meshMod(mesh);
+    directTopoChange meshMod(mesh);
 
     fvMeshAdder::mergePoints(mesh, pointToMaster, meshMod);
 
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
index 5d70e8ecd..4e492b63b 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
@@ -648,7 +648,21 @@ int main(int argc, char *argv[])
 
         // Subset 0 cells, no parallel comms. This is used to create zero-sized
         // fields.
-        subsetterPtr.reset(new fvMeshSubset(mesh));
+        subsetterPtr.reset
+        (
+            new fvMeshSubset
+            (
+                IOobject
+                (
+                    "set",
+                    runTime.timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh
+            )
+        );
         subsetterPtr().setLargeCellSubset(labelHashSet(0), nonProcI, false);
     }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index b23386049..e2dc741fc 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -451,6 +451,7 @@ void writePatchField
         ensightFilePtr = new OFstream
         (
             postProcPath/ensightFileName,
+            ios_base::out|ios_base::trunc,
             runTime.writeFormat(),
             runTime.writeVersion(),
             runTime.writeCompression()
@@ -541,6 +542,7 @@ void ensightFieldAscii
         ensightFilePtr = new OFstream
         (
             postProcPath/ensightFileName,
+            ios_base::out|ios_base::trunc,
             runTime.writeFormat(),
             runTime.writeVersion(),
             runTime.writeCompression()
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index ce8f2300f..5287d0e17 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
@@ -1357,6 +1357,7 @@ void Foam::ensightMesh::writeAscii
         ensightGeometryFilePtr = new OFstream
         (
             postProcPath/ensightGeometryFileName,
+            ios_base::out|ios_base::trunc,
             runTime.writeFormat(),
             runTime.writeVersion(),
             IOstream::UNCOMPRESSED
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index dcd054249..97b9fc49e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -161,6 +161,7 @@ int main(int argc, char *argv[])
         ensightCaseFilePtr = new OFstream
         (
             ensightDir/caseFileName,
+            ios_base::out|ios_base::trunc,
             IOstream::ASCII
         );
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
index 0e3530b9c..8f2a96b49 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
@@ -10,7 +10,12 @@ if (timeDirs[0].value() < 0)
 // the case file is always ASCII
 Info << "write case: " << caseFileName.c_str() << endl;
 
-OFstream caseFile(ensightDir/caseFileName, IOstream::ASCII);
+OFstream caseFile
+(
+    ensightDir/caseFileName,
+    ios_base::out|ios_base::trunc,
+    IOstream::ASCII
+);
 caseFile.setf(ios_base::left);
 
 caseFile.setf(ios_base::scientific, ios_base::floatfield);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
new file mode 100644
index 000000000..63ef5eef2
--- /dev/null
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
@@ -0,0 +1,105 @@
+// check the final time directory for the following:
+
+// 1. volume fields
+HashTable<word> volumeFields;
+
+// 2. the fields for each cloud:
+HashTable< HashTable<word> > cloudFields;
+
+if (timeDirs.size())
+{
+    IOobjectList objs(mesh, timeDirs[timeDirs.size()-1].name());
+
+    forAllConstIter(IOobjectList, objs, fieldIter)
+    {
+        const IOobject& obj = *fieldIter();
+        const word& fieldName = obj.name();
+        const word& fieldType = obj.headerClassName();
+
+        if (fieldName.size() > 2 && fieldName(fieldName.size()-2, 2) == "_0")
+        {
+            // ignore _0 fields
+        }
+        else if (volFieldTypes.found(fieldType))
+        {
+            // simply ignore types that we don't handle
+            volumeFields.insert(fieldName, fieldType);
+        }
+    }
+
+
+    //
+    // now check for lagrangian/<cloudName>
+    //
+    fileNameList cloudDirs = readDir
+    (
+        runTime.path()
+      / timeDirs[timeDirs.size()-1].name()
+      / regionPrefix
+      / cloud::prefix,
+        fileName::DIRECTORY
+    );
+
+    forAll(cloudDirs, cloudI)
+    {
+        const word& cloudName = cloudDirs[cloudI];
+
+        // Create a new hash table for each cloud
+        cloudFields.insert(cloudName, HashTable<word>());
+
+        // Identify the new cloud within the hash table
+        HashTable<HashTable<word> >::iterator cloudIter =
+            cloudFields.find(cloudName);
+
+        IOobjectList objs
+        (
+            mesh,
+            timeDirs[timeDirs.size()-1].name(),
+            cloud::prefix/cloudName
+        );
+
+        bool hasPositions = false;
+        forAllConstIter(IOobjectList, objs, fieldIter)
+        {
+            const IOobject obj = *fieldIter();
+            const word& fieldName = obj.name();
+            const word& fieldType = obj.headerClassName();
+
+            if (fieldName == "positions")
+            {
+                hasPositions = true;
+            }
+            else if (cloudFieldTypes.found(fieldType))
+            {
+                // simply ignore types that we don't handle
+                cloudIter().insert(fieldName, fieldType);
+            }
+        }
+
+        // drop this cloud if it has no positions or is otherwise empty
+        if (!hasPositions || cloudIter().empty())
+        {
+            Info<< "removing cloud " << cloudName << endl;
+            cloudFields.erase(cloudIter);
+        }
+    }
+
+    //
+    // verify that the variable is present for all times
+    //
+    for (label i=0; volumeFields.size() && i < timeDirs.size(); ++i)
+    {
+        IOobjectList objs(mesh, timeDirs[i].name());
+
+        forAllIter(HashTable<word>, volumeFields, fieldIter)
+        {
+            const word& fieldName = fieldIter.key();
+
+            if (!objs.found(fieldName))
+            {
+                volumeFields.erase(fieldIter);
+            }
+        }
+    }
+}
+
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
index 9edc8002a..0cdbdede5 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
@@ -240,7 +240,20 @@ int main(int argc, char *argv[])
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-#   include "createNamedMesh.H"
+    // Get region name
+    word regionName;
+
+    if (args.optionReadIfPresent("region", regionName))
+    {
+        Info<< "Create mesh " << regionName << " for time = "
+            << runTime.timeName() << Foam::nl << Foam::endl;
+    }
+    else
+    {
+        regionName = fvMesh::defaultRegion;
+        Info<< "Create mesh for time = "
+            << runTime.timeName() << Foam::nl << Foam::endl;
+    }
 
     // TecplotData/ directory in the case
     fileName fvPath(runTime.path()/"Tecplot360");
@@ -277,7 +290,17 @@ int main(int argc, char *argv[])
 
 
     // mesh wrapper; does subsetting and decomposition
-    vtkMesh vMesh(mesh, cellSetName);
+    vtkMesh vMesh
+    (
+        Foam::IOobject
+        (
+            regionName,
+            runTime.timeName(),
+            runTime,
+            Foam::IOobject::MUST_READ
+        ),
+        cellSetName
+    );
 
     forAll(timeDirs, timeI)
     {
@@ -315,23 +338,23 @@ int main(int argc, char *argv[])
         // Construct the vol fields (on the original mesh if subsetted)
 
         PtrList<volScalarField> vsf;
-        readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vsf);
+        readFields(vMesh, vMesh, objects, selectedFields, vsf);
         print("    volScalarFields            :", Info, vsf);
 
         PtrList<volVectorField> vvf;
-        readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vvf);
+        readFields(vMesh, vMesh, objects, selectedFields, vvf);
         print("    volVectorFields            :", Info, vvf);
 
         PtrList<volSphericalTensorField> vSpheretf;
-        readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vSpheretf);
+        readFields(vMesh, vMesh, objects, selectedFields, vSpheretf);
         print("    volSphericalTensorFields   :", Info, vSpheretf);
 
         PtrList<volSymmTensorField> vSymmtf;
-        readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vSymmtf);
+        readFields(vMesh, vMesh, objects, selectedFields, vSymmtf);
         print("    volSymmTensorFields        :", Info, vSymmtf);
 
         PtrList<volTensorField> vtf;
-        readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vtf);
+        readFields(vMesh, vMesh, objects, selectedFields, vtf);
         print("    volTensorFields            :", Info, vtf);
 
 
@@ -385,7 +408,7 @@ int main(int argc, char *argv[])
             readFields
             (
                 vMesh,
-                pointMesh::New(vMesh.baseMesh()),
+                pointMesh::New(vMesh),
                 objects,
                 selectedFields,
                 psf
@@ -395,7 +418,7 @@ int main(int argc, char *argv[])
             readFields
             (
                 vMesh,
-                pointMesh::New(vMesh.baseMesh()),
+                pointMesh::New(vMesh),
                 objects,
                 selectedFields,
                 pvf
@@ -405,7 +428,7 @@ int main(int argc, char *argv[])
             //readFields
             //(
             //    vMesh,
-            //    pointMesh::New(vMesh.baseMesh()),
+            //    pointMesh::New(vMesh),
             //    objects,
             //    selectedFields,
             //    pSpheretf
@@ -415,7 +438,7 @@ int main(int argc, char *argv[])
             //readFields
             //(
             //    vMesh,
-            //    pointMesh::New(vMesh.baseMesh()),
+            //    pointMesh::New(vMesh),
             //    objects,
             //    selectedFields,
             //    pSymmtf
@@ -425,7 +448,7 @@ int main(int argc, char *argv[])
             //readFields
             //(
             //    vMesh,
-            //    pointMesh::New(vMesh.baseMesh()),
+            //    pointMesh::New(vMesh),
             //    objects,
             //    selectedFields,
             //    ptf
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.C
index 759136750..7c1e17dd7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.C
@@ -34,46 +34,61 @@ License
 // Construct from components
 Foam::vtkMesh::vtkMesh
 (
-    fvMesh& baseMesh,
+    const IOobject& io,
     const word& setName
 )
 :
-    baseMesh_(baseMesh),
-    subsetter_(baseMesh),
+    fvMesh(io),
+    subsetMesh_
+    (
+        IOobject
+        (
+            "subset",
+            io.time().constant(),
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        *this
+    ),
     setName_(setName)
 {
-    if (setName.size())
+    if (setName.size() > 0)
     {
         // Read cellSet using whole mesh
-        cellSet currentSet(baseMesh_, setName_);
+        cellSet currentSet(*this, setName_);
 
         // Set current subset
-        subsetter_.setLargeCellSubset(currentSet);
+        subsetMesh_.setLargeCellSubset(currentSet);
     }
 }
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::vtkMesh::~vtkMesh()
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::polyMesh::readUpdateState Foam::vtkMesh::readUpdate()
 {
-    polyMesh::readUpdateState meshState = baseMesh_.readUpdate();
+    polyMesh::readUpdateState meshState = fvMesh::readUpdate();
 
     if (meshState != polyMesh::UNCHANGED)
     {
-        // Note: since fvMeshSubset has no movePoints() functionality reconstruct
-        // the subset even if only movement.
-
-//        topoPtr_.clear();
+        // Note: since fvMeshSubset has no movePoints() functionality
+        // reconstruct the subset even if only movement.
 
         if (setName_.size())
         {
             Info<< "Subsetting mesh based on cellSet " << setName_ << endl;
 
             // Read cellSet using whole mesh
-            cellSet currentSet(baseMesh_, setName_);
+            cellSet currentSet(*this, setName_);
 
-            subsetter_.setLargeCellSubset(currentSet);
+            subsetMesh_.setLargeCellSubset(currentSet);
         }
     }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.H b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.H
index a9dfd5c97..844331606 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.H
@@ -52,22 +52,17 @@ class Time;
 \*---------------------------------------------------------------------------*/
 
 class vtkMesh
+:
+    public fvMesh
 {
     // Private data
 
-        //- Reference to mesh
-        fvMesh& baseMesh_;
-
-        //- Subsetting engine + sub-fvMesh
-        fvMeshSubset subsetter_;
+        //- Mesh subset
+        fvMeshSubset subsetMesh_;
 
         //- Current cellSet (or empty)
         const word setName_;
 
-//        //- Current decomposition of topology
-//        mutable autoPtr<vtkTopo> topoPtr_;
-
-
 
     // Private Member Functions
 
@@ -83,22 +78,21 @@ public:
     // Constructors
 
         //- Construct from components
-        vtkMesh(fvMesh& baseMesh, const word& setName = "");
+        vtkMesh(const IOobject& io, const word& setName = "");
+
+
+    // Destructor
+
+        ~vtkMesh();
 
 
     // Member Functions
 
         // Access
 
-            //- whole mesh
-            const fvMesh& baseMesh() const
+            const fvMeshSubset& subsetMesh() const
             {
-                return baseMesh_;
-            }
-
-            const fvMeshSubset& subsetter() const
-            {
-                return subsetter_;
+                return subsetMesh_;
             }
 
             //- Check if running subMesh
@@ -107,41 +101,19 @@ public:
                 return setName_.size();
             }
 
-//            //- topology
-//            const vtkTopo& topo() const
-//            {
-//                if (topoPtr_.empty())
-//                {
-//                    topoPtr_.reset(new vtkTopo(mesh()));
-//                }
-//                return topoPtr_();
-//            }
-
             //- Access either mesh or submesh
             const fvMesh& mesh() const
             {
                 if (useSubMesh())
                 {
-                    return subsetter_.subMesh();
+                    return subsetMesh_.subMesh();
                 }
                 else
                 {
-                    return baseMesh_;
+                    return *this;
                 }
             }
 
-//            //- Number of field cells
-//            label nFieldCells() const
-//            {
-//                return topo().vertLabels().size();
-//            }
-//
-//            //- Number of field points
-//            label nFieldPoints() const
-//            {
-//                return mesh().nPoints() + topo().addPointCellLabels().size();
-//            }
-
 
         // Edit
 
@@ -156,7 +128,7 @@ public:
             {
                 if (useSubMesh())
                 {
-                    tmp<GeoField> subFld = subsetter_.interpolate(fld);
+                    tmp<GeoField> subFld = subsetMesh_.interpolate(fld);
                     subFld().rename(fld.name());
                     return subFld;
                 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index f5d8b4978..b6870b17f 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -477,7 +477,7 @@ int main(int argc, char *argv[])
         // Construct the vol fields (on the original mesh if subsetted)
 
         PtrList<volScalarField> vsf;
-        readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vsf);
+        readFields(vMesh, vMesh, objects, selectedFields, vsf);
         readFields(vMesh, vMesh, objects, selectedFields, vsf);
         print("    volScalarFields            :", Info, vsf);
 
@@ -526,7 +526,7 @@ int main(int argc, char *argv[])
             readFields
             (
                 vMesh,
-                vMesh.basePointMesh(),
+                pointMesh::New(vMesh),
                 objects,
                 selectedFields,
                 psf
@@ -536,7 +536,7 @@ int main(int argc, char *argv[])
             readFields
             (
                 vMesh,
-                vMesh.basePointMesh(),
+                pointMesh::New(vMesh),
                 objects,
                 selectedFields,
                 pvf
@@ -546,7 +546,7 @@ int main(int argc, char *argv[])
             readFields
             (
                 vMesh,
-                vMesh.basePointMesh(),
+                pointMesh::New(vMesh),
                 objects,
                 selectedFields,
                 pSpheretf
@@ -556,7 +556,7 @@ int main(int argc, char *argv[])
             readFields
             (
                 vMesh,
-                vMesh.basePointMesh(),
+                pointMesh::New(vMesh),
                 objects,
                 selectedFields,
                 pSymmtf
@@ -566,7 +566,7 @@ int main(int argc, char *argv[])
             readFields
             (
                 vMesh,
-                vMesh.basePointMesh(),
+                pointMesh::New(vMesh),
                 objects,
                 selectedFields,
                 ptf
@@ -943,16 +943,19 @@ int main(int argc, char *argv[])
 
         //---------------------------------------------------------------------
         //
-        // Write lagrangian data
+        // Write finite area data
         //
         //---------------------------------------------------------------------
 
-        forAllConstIter(HashSet<fileName>, allCloudDirs, iter)
+        if (args.options().found("faMesh"))
         {
-            const fileName& cloudName = iter.key();
+            mkDir(fvPath/"faMesh");
 
-            // Always create the cloud directory.
-            mkDir(fvPath/cloud::prefix/cloudName);
+            fileName faFileName =
+                fvPath/"faMesh"/"faMesh"
+              + "_"
+              + name(timeI)
+              + ".vtk";
 
             // Create FA mesh
             faMesh aMesh(vMesh.mesh());
@@ -1012,6 +1015,21 @@ int main(int argc, char *argv[])
         //
         //---------------------------------------------------------------------
 
+        forAllConstIter(HashSet<fileName>, allCloudDirs, iter)
+        {
+            const fileName& cloudName = iter.key();
+
+            // Always create the cloud directory.
+            mkDir(fvPath/cloud::prefix/cloudName);
+
+            fileName lagrFileName
+            (
+                fvPath/cloud::prefix/cloudName/cloudName
+              + "_" + timeDesc + ".vtk"
+            );
+
+            Info<< "    Lagrangian: " << lagrFileName << endl;
+
 
             IOobjectList sprayObjs
             (
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
index 9188f82f4..8cb5a9e4f 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
@@ -80,6 +80,49 @@ void readFields
 }
 
 
+template<class GeoField>
+void readFieldsNoSubset
+(
+    const vtkMesh& vMesh,
+    const typename GeoField::Mesh& mesh,
+    const IOobjectList& objects,
+    const HashSet<word>& selectedFields,
+    PtrList<GeoField>& fields
+)
+{
+    // Search list of objects for volScalarFields
+    IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
+
+    // Construct the vol scalar fields
+    fields.setSize(fieldObjects.size());
+    label nFields = 0;
+
+    for
+    (
+        IOobjectList::iterator iter = fieldObjects.begin();
+        iter != fieldObjects.end();
+        ++iter
+    )
+    {
+        if (!selectedFields.size() || selectedFields.found(iter()->name()))
+        {
+            fields.set
+            (
+                nFields,
+                GeoField
+                (
+                    *iter(),
+                    mesh
+                )
+            );
+            nFields++;
+        }
+    }
+
+    fields.setSize(nFields);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
index c6ed18a05..ab07601da 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
@@ -56,6 +56,17 @@ void readFields
     PtrList<GeoField>& fields
 );
 
+// Read the fields and optionally subset and put on the pointer list
+template<class GeoField>
+void readFieldsNoSubset
+(
+    const vtkMesh& vMesh,
+    const typename GeoField::Mesh& mesh,
+    const IOobjectList& objects,
+    const HashSet<word>& selectedFields,
+    PtrList<GeoField>& fields
+);
+
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
index 9bed9ceb8..f68c2b9fb 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
@@ -87,7 +87,6 @@ Foam::polyMesh::readUpdateState Foam::vtkMesh::readUpdate()
         //  reconstruct the subset even if only movement.
 
         topoPtr_.clear();
-        pointMeshPtr_.clear();
 
         if (setName_.size())
         {
diff --git a/applications/utilities/postProcessing/graphics/newEnsightFoamReader/USERD_set_filenames.H b/applications/utilities/postProcessing/graphics/newEnsightFoamReader/USERD_set_filenames.H
index e0e15a51d..921620e52 100644
--- a/applications/utilities/postProcessing/graphics/newEnsightFoamReader/USERD_set_filenames.H
+++ b/applications/utilities/postProcessing/graphics/newEnsightFoamReader/USERD_set_filenames.H
@@ -47,7 +47,7 @@ int USERD_set_filenames
     }
     caseDir = tmp;
 
-    if (!dir(rootDir/caseDir))
+    if (!isDir(rootDir/caseDir))
     {
        Info<< rootDir/caseDir << " is not a valid directory."
            << endl;
diff --git a/applications/utilities/postProcessing/graphics/paraFoam/Allwmake b/applications/utilities/postProcessing/graphics/paraFoam/Allwmake
deleted file mode 100755
index e69de29bb..000000000
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
index 961fa6fab..cf8e7eec1 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
@@ -31,7 +31,7 @@ Description
 
     Default behaviour assumes operating in incompressible mode. To apply to
     compressible RAS cases, use the -compressible option.
-    
+
     Extended version for being able to handle two phase flows using the
     -twoPhase option.
 
@@ -40,7 +40,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "twoPhaseMixture.H"
+#include "incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
 #include "incompressible/RAS/RASModel/RASModel.H"
 #include "nutWallFunction/nutWallFunctionFvPatchScalarField.H"
@@ -64,7 +64,7 @@ void calcIncompressibleYPlus
     typedef incompressible::RASModels::nutWallFunctionFvPatchScalarField
         wallFunctionPatchField;
 
-    #include "createPhi.H"
+#   include "createPhi.H"
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
@@ -134,7 +134,7 @@ void calcCompressibleYPlus
     Info << "Reading field rho\n" << endl;
     volScalarField rho(rhoHeader, mesh);
 
-    #include "compressibleCreatePhi.H"
+#   include "compressibleCreatePhi.H"
 
     autoPtr<basicPsiThermo> pThermo
     (
@@ -185,6 +185,60 @@ void calcCompressibleYPlus
 }
 
 
+// Calculate two phase Y+
+void calcTwoPhaseYPlus
+(
+    const fvMesh& mesh,
+    const Time& runTime,
+    const volVectorField& U,
+    volScalarField& yPlus
+)
+{
+    typedef incompressible::RASModels::nutWallFunctionFvPatchScalarField
+        wallFunctionPatchField;
+
+#   include "createPhi.H"
+
+    Info<< "Reading transportProperties\n" << endl;
+    twoPhaseMixture twoPhaseProperties(U, phi, "gamma");
+
+    autoPtr<incompressible::RASModel> RASModel
+    (
+        incompressible::RASModel::New(U, phi, twoPhaseProperties)
+    );
+
+    const volScalarField::GeometricBoundaryField nutPatches =
+        RASModel->nut()().boundaryField();
+
+    bool foundNutPatch = false;
+    forAll(nutPatches, patchi)
+    {
+        if (isA<wallFunctionPatchField>(nutPatches[patchi]))
+        {
+            foundNutPatch = true;
+
+            const wallFunctionPatchField& nutPw =
+                dynamic_cast<const wallFunctionPatchField&>
+                    (nutPatches[patchi]);
+
+            yPlus.boundaryField()[patchi] = nutPw.yPlus();
+            const scalarField& Yp = yPlus.boundaryField()[patchi];
+
+            Info<< "Patch " << patchi
+                << " named " << nutPw.patch().name()
+                << " y+ : min: " << min(Yp) << " max: " << max(Yp)
+                << " average: " << average(Yp) << nl << endl;
+        }
+    }
+
+    if (!foundNutPatch)
+    {
+        Info<< "    no " << wallFunctionPatchField::typeName << " patches"
+            << endl;
+    }
+}
+
+
 int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
@@ -252,11 +306,14 @@ int main(int argc, char *argv[])
             {
                 calcCompressibleYPlus(mesh, runTime, U, yPlus);
             }
+            else if (twoPhase)
+            {
+                calcTwoPhaseYPlus(mesh, runTime, U, yPlus);
+            }
             else
             {
                 calcIncompressibleYPlus(mesh, runTime, U, yPlus);
             }
-            Add two phase.  HJ, 25/Aug/2010
         }
         else
         {
diff --git a/etc/cshrc b/etc/cshrc
index 589f80221..40c67dfe1 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -37,7 +37,7 @@ setenv WM_PROJECT_VERSION 1.6-ext
 # helps to easily write #ifdefs to detect a dev-version
 setenv FOAM_DEV 1
 
-################################################################################
+###############################################################################
 # USER EDITABLE PART
 #
 #    either setenv FOAM_INST_DIR before sourcing this file or set
@@ -51,7 +51,7 @@ set foamInstall = $HOME/$WM_PROJECT
 # set foamInstall = /opt/$WM_PROJECT
 #
 # END OF (NORMAL) USER EDITABLE PART
-################################################################################
+###############################################################################
 
 # note the location for later use (eg, in job scripts)
 if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall
diff --git a/src/Allwmake b/src/Allwmake
index d8585c7af..f2ebba28d 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -1,4 +1,14 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+if [ "$PWD" != "$WM_PROJECT_DIR/src" ]
+then
+    echo "Error: Current directory in not \$WM_PROJECT_DIR/src"
+    echo "    The environment variable are not consistent with the installation."
+    echo "    Check the OpenFOAM entries in your dot-files and source them."
+    exit 1
+fi
+
 set -x
 
 # update OpenFOAM version strings if required
@@ -28,10 +38,10 @@ wmake libso finiteArea
 wmake libso lduSolvers
 wmake libso dynamicMesh
 
-( cd tetDecompositionFiniteElement ; ./Allwmake )
+(cd tetDecompositionFiniteElement ; Allwmake)
 
 wmake libso fvMotionSolver
-( cd  tetDecompositionMotionSolver; ./Allwmake )
+(cd tetDecompositionMotionSolver ; Allwmake)
 
 wmake libso coupledMatrix
 wmake libso sampling
@@ -43,14 +53,19 @@ wmake libso engine
 wmake libso ODE
 wmake libso randomProcesses
 
-( cd thermophysicalModels && ./Allwmake )
-( cd transportModels && ./Allwmake )
-( cd turbulenceModels && ./Allwmake )
-( cd lagrangian && ./Allwmake )
-( cd postProcessing && ./Allwmake )
-( cd conversion && ./Allwmake )
+thermophysicalModels/Allwmake
+transportModels/Allwmake
+turbulenceModels/Allwmake
+lagrangian/Allwmake
+postProcessing/Allwmake
+conversion/Allwmake
 
 wmake libso autoMesh
 wmake libso errorEstimation
 
+fvAgglomerationMethods/Allwmake
+
+wmake libso fvMotionSolver
+wmake libso engine
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index 2c1e0fc2d..a411696cc 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -123,7 +123,7 @@ private:
             mutable polyBoundaryMesh boundary_;
 
             //- Mesh bounding-box.
-            //  Created from points on construction, updated when the mesh moves
+            //  Created from points on construction, updated with mesh motion
             boundBox bounds_;
 
             //- Vector of non-constrained directions in mesh
diff --git a/src/coupledMatrix/coupledFvMatrices/coupledFvMatrix/coupledFvMatrix.C b/src/coupledMatrix/coupledFvMatrices/coupledFvMatrix/coupledFvMatrix.C
index cdfb0c6ad..c9f0565ee 100644
--- a/src/coupledMatrix/coupledFvMatrices/coupledFvMatrix/coupledFvMatrix.C
+++ b/src/coupledMatrix/coupledFvMatrices/coupledFvMatrix/coupledFvMatrix.C
@@ -70,11 +70,11 @@ Foam::word Foam::coupledFvMatrix<Type>::coupledPsiName() const
 
 template<class Type>
 Foam::coupledSolverPerformance
-Foam::coupledFvMatrix<Type>::solve(Istream& solverControls)
+Foam::coupledFvMatrix<Type>::solve(const dictionary& solverControls)
 {
     if (debug)
     {
-        InfoIn("coupledFvMatrix<Type>::solve(Istream& solverControls)")
+        InfoIn("coupledFvMatrix<Type>::solve(const dictionary&)")
             << "solving coupledFvMatrix<Type>" << endl;
     }
 
@@ -180,7 +180,7 @@ Foam::coupledFvMatrix<Type>::solve(Istream& solverControls)
             bouCoeffsCmpt,
             intCoeffsCmpt,
             interfaces,
-            solverControls.rewind()
+            solverControls
         )->solve(psiCmpt, sourceCmpt, cmpt);
 
         solverPerf.print();
diff --git a/src/coupledMatrix/coupledFvMatrices/coupledFvMatrix/coupledFvMatrix.H b/src/coupledMatrix/coupledFvMatrices/coupledFvMatrix/coupledFvMatrix.H
index 5783965c0..085d4db8e 100644
--- a/src/coupledMatrix/coupledFvMatrices/coupledFvMatrix/coupledFvMatrix.H
+++ b/src/coupledMatrix/coupledFvMatrices/coupledFvMatrix/coupledFvMatrix.H
@@ -97,8 +97,8 @@ public:
     // Member functions
 
         //- Solve returning the solution statistics.
-        //  Solver controls read Istream
-        coupledSolverPerformance solve(Istream&);
+        //  Solver controls read from dictionary
+        coupledSolverPerformance solve(const dictionary&);
 
         //- Solve returning the solution statistics.
         //  Solver controls read from fvSolution
diff --git a/src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.C b/src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.C
index 0080901df..01796187a 100644
--- a/src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.C
+++ b/src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.C
@@ -39,11 +39,14 @@ namespace Foam
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<>
-coupledSolverPerformance coupledFvMatrix<scalar>::solve(Istream& solverControls)
+coupledSolverPerformance coupledFvMatrix<scalar>::solve
+(
+    const dictionary& solverControls
+)
 {
     if (debug)
     {
-        InfoIn("coupledFvMatrix<Type>::solve(Istream& solverControls)")
+        InfoIn("coupledFvMatrix<Type>::solve(const dictionary)")
             << "solving coupledFvMatrix<Type>" << endl;
     }
 
diff --git a/src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.H b/src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.H
index eb9c64e41..de80f7aaa 100644
--- a/src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.H
+++ b/src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.H
@@ -46,7 +46,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<>
-coupledSolverPerformance coupledFvMatrix<scalar>::solve(Istream&);
+coupledSolverPerformance coupledFvMatrix<scalar>::solve(const dictionary&);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/coupledMatrix/coupledLduMatrix/coupledLduMatrix.H b/src/coupledMatrix/coupledLduMatrix/coupledLduMatrix.H
index aa0eaaf98..e4b36adc8 100644
--- a/src/coupledMatrix/coupledLduMatrix/coupledLduMatrix.H
+++ b/src/coupledMatrix/coupledLduMatrix/coupledLduMatrix.H
@@ -109,8 +109,8 @@ public:
                 const lduInterfaceFieldPtrsListList& interfaces,
                 const direction cmpt
             ) const;
-    
-            //- Matrix transpose multiplication with updated coupled interfaces.
+
+            //- Matrix transpose multiplication with updated coupled interfaces
             void Tmul
             (
                 FieldField<Field, scalar>& result,
diff --git a/src/coupledMatrix/coupledLduPrecon/coupledLduPrecon/coupledLduPrecon.C b/src/coupledMatrix/coupledLduPrecon/coupledLduPrecon/coupledLduPrecon.C
index b5f2d5e78..bceacf6a5 100644
--- a/src/coupledMatrix/coupledLduPrecon/coupledLduPrecon/coupledLduPrecon.C
+++ b/src/coupledMatrix/coupledLduPrecon/coupledLduPrecon/coupledLduPrecon.C
@@ -26,12 +26,12 @@ Class
     coupledLduPrecon
 
 Description
-    Virtual base class for matrix preconditioners
+    Virtual base class for coupled matrix preconditioners
 
 Author
     Hrvoje Jasak, Wikki Ltd.  All rights reserved
 
-\*----------------------------------------------------------------------------*/
+\*---------------------------------------------------------------------------*/
 
 #include "coupledLduPrecon.H"
 
@@ -45,6 +45,28 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
+Foam::word Foam::coupledLduPrecon::getName
+(
+    const dictionary& dict
+)
+{
+    word name;
+
+    // handle primitive or dictionary entry
+    const entry& e = dict.lookupEntry("preconditioner", false, false);
+    if (e.isDict())
+    {
+        e.dict().lookup("preconditioner") >> name;
+    }
+    else
+    {
+        e.stream() >> name;
+    }
+
+    return name;
+}
+
+
 Foam::autoPtr<Foam::coupledLduPrecon> Foam::coupledLduPrecon::New
 (
     const coupledLduMatrix& matrix,
@@ -54,7 +76,20 @@ Foam::autoPtr<Foam::coupledLduPrecon> Foam::coupledLduPrecon::New
     const dictionary& dict
 )
 {
-    word preconName(dict.lookup("type"));
+    word preconName;
+
+    // handle primitive or dictionary entry
+    const entry& e = dict.lookupEntry("preconditioner", false, false);
+    if (e.isDict())
+    {
+        e.dict().lookup("preconditioner") >> preconName;
+    }
+    else
+    {
+        e.stream() >> preconName;
+    }
+
+    const dictionary& controls = e.isDict() ? e.dict() : dictionary::null;
 
     dictionaryConstructorTable::iterator constructorIter =
         dictionaryConstructorTablePtr_->find(preconName);
@@ -87,7 +122,7 @@ Foam::autoPtr<Foam::coupledLduPrecon> Foam::coupledLduPrecon::New
             bouCoeffs,
             intCoeffs,
             interfaces,
-            dict
+            controls
         )
     );
 }
diff --git a/src/coupledMatrix/coupledLduPrecon/coupledLduPrecon/coupledLduPrecon.H b/src/coupledMatrix/coupledLduPrecon/coupledLduPrecon/coupledLduPrecon.H
index bda0527f9..b252553d4 100644
--- a/src/coupledMatrix/coupledLduPrecon/coupledLduPrecon/coupledLduPrecon.H
+++ b/src/coupledMatrix/coupledLduPrecon/coupledLduPrecon/coupledLduPrecon.H
@@ -80,6 +80,9 @@ protected:
 
 public:
 
+    //- Find the preconditioner name (directly or from a sub-dictionary)
+    static word getName(const dictionary&);
+
     //- Runtime type information
     virtual const word& type() const = 0;
 
diff --git a/src/coupledMatrix/coupledLduSmoother/coupledLduSmoother/coupledLduSmoother.C b/src/coupledMatrix/coupledLduSmoother/coupledLduSmoother/coupledLduSmoother.C
index f41f2566e..6745f9a93 100644
--- a/src/coupledMatrix/coupledLduSmoother/coupledLduSmoother/coupledLduSmoother.C
+++ b/src/coupledMatrix/coupledLduSmoother/coupledLduSmoother/coupledLduSmoother.C
@@ -31,7 +31,7 @@ Description
 Author
     Hrvoje Jasak, Wikki Ltd.  All rights reserved.
 
-\*----------------------------------------------------------------------------*/
+\*---------------------------------------------------------------------------*/
 
 #include "coupledLduSmoother.H"
 
@@ -45,15 +45,53 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
+Foam::word Foam::coupledLduSmoother::getName
+(
+    const dictionary& dict
+)
+{
+    word name;
+
+    // handle primitive or dictionary entry
+    const entry& e = dict.lookupEntry("smoother", false, false);
+    if (e.isDict())
+    {
+        e.dict().lookup("smoother") >> name;
+    }
+    else
+    {
+        e.stream() >> name;
+    }
+
+    return name;
+}
+
+
 Foam::autoPtr<Foam::coupledLduSmoother> Foam::coupledLduSmoother::New
 (
-    const word& smootherName,
     const coupledLduMatrix& matrix,
     const PtrList<FieldField<Field, scalar> >& bouCoeffs,
     const PtrList<FieldField<Field, scalar> >& intCoeffs,
-    const lduInterfaceFieldPtrsListList& interfaces
+    const lduInterfaceFieldPtrsListList& interfaces,
+    const dictionary& dict
 )
 {
+    word smootherName;
+
+    // Handle primitive or dictionary entry
+    const entry& e = dict.lookupEntry("smoother", false, false);
+    if (e.isDict())
+    {
+        e.dict().lookup("smoother") >> smootherName;
+    }
+    else
+    {
+        e.stream() >> smootherName;
+    }
+
+    // Not (yet?) needed:
+    // const dictionary& controls = e.isDict() ? e.dict() : dictionary::null;
+
     wordConstructorTable::iterator constructorIter =
         wordConstructorTablePtr_->find(smootherName);
 
diff --git a/src/coupledMatrix/coupledLduSmoother/coupledLduSmoother/coupledLduSmoother.H b/src/coupledMatrix/coupledLduSmoother/coupledLduSmoother/coupledLduSmoother.H
index d0cc4dd00..9322e2d89 100644
--- a/src/coupledMatrix/coupledLduSmoother/coupledLduSmoother/coupledLduSmoother.H
+++ b/src/coupledMatrix/coupledLduSmoother/coupledLduSmoother/coupledLduSmoother.H
@@ -80,6 +80,9 @@ protected:
 
 public:
 
+    //- Find the smoother name (directly or from a sub-dictionary)
+    static word getName(const dictionary&);
+
     //- Runtime type information
     virtual const word& type() const = 0;
 
@@ -129,11 +132,11 @@ public:
         //- Select given matrix data and type
         static autoPtr<coupledLduSmoother> New
         (
-            const word& smootherName,
             const coupledLduMatrix& matrix,
             const PtrList<FieldField<Field, scalar> >& bouCoeffs,
             const PtrList<FieldField<Field, scalar> >& intCoeffs,
-            const lduInterfaceFieldPtrsListList& interfaces
+            const lduInterfaceFieldPtrsListList& interfaces,
+            const dictionary& dict
         );
 
 
diff --git a/src/coupledMatrix/coupledLduSolver/bicgSolver/coupledBicgSolver.C b/src/coupledMatrix/coupledLduSolver/bicgSolver/coupledBicgSolver.C
index 85982ca79..49d49bebb 100644
--- a/src/coupledMatrix/coupledLduSolver/bicgSolver/coupledBicgSolver.C
+++ b/src/coupledMatrix/coupledLduSolver/bicgSolver/coupledBicgSolver.C
@@ -54,7 +54,7 @@ Foam::coupledBicgSolver::coupledBicgSolver
     const PtrList<FieldField<Field, scalar> >& bouCoeffs,
     const PtrList<FieldField<Field, scalar> >& intCoeffs,
     const lduInterfaceFieldPtrsListList& interfaces,
-    Istream& solverData
+    const dictionary& solverData
 )
 :
     coupledIterativeSolver
diff --git a/src/coupledMatrix/coupledLduSolver/bicgSolver/coupledBicgSolver.H b/src/coupledMatrix/coupledLduSolver/bicgSolver/coupledBicgSolver.H
index 7c81572a7..b397d8603 100644
--- a/src/coupledMatrix/coupledLduSolver/bicgSolver/coupledBicgSolver.H
+++ b/src/coupledMatrix/coupledLduSolver/bicgSolver/coupledBicgSolver.H
@@ -86,7 +86,7 @@ public:
             const PtrList<FieldField<Field, scalar> >& bouCoeffs,
             const PtrList<FieldField<Field, scalar> >& intCoeffs,
             const lduInterfaceFieldPtrsListList& interfaces,
-            Istream& solverData
+            const dictionary& solverData
         );
 
 
diff --git a/src/coupledMatrix/coupledLduSolver/bicgStabSolver/coupledBicgStabSolver.C b/src/coupledMatrix/coupledLduSolver/bicgStabSolver/coupledBicgStabSolver.C
index 785d613a1..ddf5d3cfe 100644
--- a/src/coupledMatrix/coupledLduSolver/bicgStabSolver/coupledBicgStabSolver.C
+++ b/src/coupledMatrix/coupledLduSolver/bicgStabSolver/coupledBicgStabSolver.C
@@ -56,7 +56,7 @@ Foam::coupledBicgStabSolver::coupledBicgStabSolver
     const PtrList<FieldField<Field, scalar> >& bouCoeffs,
     const PtrList<FieldField<Field, scalar> >& intCoeffs,
     const lduInterfaceFieldPtrsListList& interfaces,
-    Istream& solverData
+    const dictionary& solverData
 )
 :
     coupledIterativeSolver
diff --git a/src/coupledMatrix/coupledLduSolver/bicgStabSolver/coupledBicgStabSolver.H b/src/coupledMatrix/coupledLduSolver/bicgStabSolver/coupledBicgStabSolver.H
index ec77e3b73..649e0852f 100644
--- a/src/coupledMatrix/coupledLduSolver/bicgStabSolver/coupledBicgStabSolver.H
+++ b/src/coupledMatrix/coupledLduSolver/bicgStabSolver/coupledBicgStabSolver.H
@@ -86,7 +86,7 @@ public:
             const PtrList<FieldField<Field, scalar> >& bouCoeffs,
             const PtrList<FieldField<Field, scalar> >& intCoeffs,
             const lduInterfaceFieldPtrsListList& interfaces,
-            Istream& solverData
+            const dictionary& solverData
         );
 
 
diff --git a/src/coupledMatrix/coupledLduSolver/cgSolver/coupledCgSolver.C b/src/coupledMatrix/coupledLduSolver/cgSolver/coupledCgSolver.C
index 388c1ffcb..ac8275762 100644
--- a/src/coupledMatrix/coupledLduSolver/cgSolver/coupledCgSolver.C
+++ b/src/coupledMatrix/coupledLduSolver/cgSolver/coupledCgSolver.C
@@ -54,7 +54,7 @@ Foam::coupledCgSolver::coupledCgSolver
     const PtrList<FieldField<Field, scalar> >& bouCoeffs,
     const PtrList<FieldField<Field, scalar> >& intCoeffs,
     const lduInterfaceFieldPtrsListList& interfaces,
-    Istream& solverData
+    const dictionary& solverData
 )
 :
     coupledIterativeSolver
diff --git a/src/coupledMatrix/coupledLduSolver/cgSolver/coupledCgSolver.H b/src/coupledMatrix/coupledLduSolver/cgSolver/coupledCgSolver.H
index 3481f736c..9d813170a 100644
--- a/src/coupledMatrix/coupledLduSolver/cgSolver/coupledCgSolver.H
+++ b/src/coupledMatrix/coupledLduSolver/cgSolver/coupledCgSolver.H
@@ -87,7 +87,7 @@ public:
             const PtrList<FieldField<Field, scalar> >& bouCoeffs,
             const PtrList<FieldField<Field, scalar> >& intCoeffs,
             const lduInterfaceFieldPtrsListList& interfaces,
-            Istream& solverData
+            const dictionary& solverData
         );
 
 
diff --git a/src/coupledMatrix/coupledLduSolver/coupledLduSolver/coupledLduSolver.C b/src/coupledMatrix/coupledLduSolver/coupledLduSolver/coupledLduSolver.C
index b0d4ca18c..1ad97f543 100644
--- a/src/coupledMatrix/coupledLduSolver/coupledLduSolver/coupledLduSolver.C
+++ b/src/coupledMatrix/coupledLduSolver/coupledLduSolver/coupledLduSolver.C
@@ -64,10 +64,10 @@ autoPtr<coupledLduSolver> coupledLduSolver::New
     const PtrList<FieldField<Field, scalar> >& bouCoeffs,
     const PtrList<FieldField<Field, scalar> >& intCoeffs,
     const lduInterfaceFieldPtrsListList& interfaces,
-    Istream& solverData
+    const dictionary& dict
 )
 {
-    word solverName(solverData);
+    word solverName(dict.lookup("solver"));
 
     if (matrix.diagonal())
     {
@@ -99,9 +99,9 @@ autoPtr<coupledLduSolver> coupledLduSolver::New
                 "    const PtrList<FieldField<Field, scalar> >& bouCoeffs,\n"
                 "    const PtrList<FieldField<Field, scalar> >& intCoeffs,\n"
                 "    const lduInterfaceFieldPtrsListList& interfaces,\n"
-                "    Istream& solverData\n"
+                "    const dictionary& dict\n"
                 ")",
-                solverData
+                dict
             )   << "Unknown symmetric matrix solver " << solverName
                 << endl << endl
                 << "Valid symmetric matrix solvers are :" << endl
@@ -118,7 +118,7 @@ autoPtr<coupledLduSolver> coupledLduSolver::New
                 bouCoeffs,
                 intCoeffs,
                 interfaces,
-                solverData
+                dict
             )
         );
     }
@@ -138,9 +138,9 @@ autoPtr<coupledLduSolver> coupledLduSolver::New
                 "    const PtrList<FieldField<Field, scalar> >& bouCoeffs,\n"
                 "    const PtrList<FieldField<Field, scalar> >& intCoeffs,\n"
                 "    const lduInterfaceFieldPtrsListList& interfaces,\n"
-                "    Istream& solverData\n"
+                "    const dictionary& dict\n"
                 ")",
-                solverData
+                dict
             )   << "Unknown asymmetric matrix solver " << solverName
                 << endl << endl
                 << "Valid asymmetric matrix solvers are :" << endl
@@ -157,7 +157,7 @@ autoPtr<coupledLduSolver> coupledLduSolver::New
                 bouCoeffs,
                 intCoeffs,
                 interfaces,
-                solverData
+                dict
             )
         );
     }
@@ -173,7 +173,7 @@ autoPtr<coupledLduSolver> coupledLduSolver::New
             "    const PtrList<FieldField<Field, scalar> >& bouCoeffs,\n"
             "    const PtrList<FieldField<Field, scalar> >& intCoeffs,\n"
             "    const lduInterfaceFieldPtrsListList& interfaces,\n"
-            "    Istream& solverData\n"
+            "    const dictionary& dict\n"
             ")"
         )   << "cannot solve incomplete matrix, "
                "no diagonal or off-diagonal coefficient"
diff --git a/src/coupledMatrix/coupledLduSolver/coupledLduSolver/coupledLduSolver.H b/src/coupledMatrix/coupledLduSolver/coupledLduSolver/coupledLduSolver.H
index c555bf398..31c9f4890 100644
--- a/src/coupledMatrix/coupledLduSolver/coupledLduSolver/coupledLduSolver.H
+++ b/src/coupledMatrix/coupledLduSolver/coupledLduSolver/coupledLduSolver.H
@@ -95,7 +95,7 @@ public:
                 const PtrList<FieldField<Field, scalar> >& bouCoeffs,
                 const PtrList<FieldField<Field, scalar> >& intCoeffs,
                 const lduInterfaceFieldPtrsListList& interfaces,
-                Istream& solverData
+                const dictionary& solverData
             ),
             (
                 fieldName,
@@ -118,7 +118,7 @@ public:
                 const PtrList<FieldField<Field, scalar> >& bouCoeffs,
                 const PtrList<FieldField<Field, scalar> >& intCoeffs,
                 const lduInterfaceFieldPtrsListList& interfaces,
-                Istream& solverData
+                const dictionary& solverData
             ),
             (
                 fieldName,
@@ -160,7 +160,7 @@ public:
                 const PtrList<FieldField<Field, scalar> >& bouCoeffs,
                 const PtrList<FieldField<Field, scalar> >& intCoeffs,
                 const lduInterfaceFieldPtrsListList& interfaces,
-                Istream& solverData
+                const dictionary& solverData
             );
 
 
diff --git a/src/coupledMatrix/coupledLduSolver/iterativeSolver/coupledIterativeSolver.C b/src/coupledMatrix/coupledLduSolver/iterativeSolver/coupledIterativeSolver.C
index 271979eef..37b8e405c 100644
--- a/src/coupledMatrix/coupledLduSolver/iterativeSolver/coupledIterativeSolver.C
+++ b/src/coupledMatrix/coupledLduSolver/iterativeSolver/coupledIterativeSolver.C
@@ -41,7 +41,7 @@ Foam::coupledIterativeSolver::coupledIterativeSolver
     const PtrList<FieldField<Field, scalar> >& bouCoeffs,
     const PtrList<FieldField<Field, scalar> >& intCoeffs,
     const lduInterfaceFieldPtrsListList& interfaces,
-    Istream& solverData
+    const dictionary& solverData
 )
 :
     coupledLduSolver
diff --git a/src/coupledMatrix/coupledLduSolver/iterativeSolver/coupledIterativeSolver.H b/src/coupledMatrix/coupledLduSolver/iterativeSolver/coupledIterativeSolver.H
index 633cd35a7..75b9378be 100644
--- a/src/coupledMatrix/coupledLduSolver/iterativeSolver/coupledIterativeSolver.H
+++ b/src/coupledMatrix/coupledLduSolver/iterativeSolver/coupledIterativeSolver.H
@@ -130,7 +130,7 @@ public:
             const PtrList<FieldField<Field, scalar> >& bouCoeffs,
             const PtrList<FieldField<Field, scalar> >& intCoeffs,
             const lduInterfaceFieldPtrsListList& interfaces,
-            Istream& solverData
+            const dictionary& solverData
         );
 
 
diff --git a/src/coupledMatrix/coupledLduSolver/smoothSolver/coupledSmoothSolver.C b/src/coupledMatrix/coupledLduSolver/smoothSolver/coupledSmoothSolver.C
index 88ae37476..c71c1533f 100644
--- a/src/coupledMatrix/coupledLduSolver/smoothSolver/coupledSmoothSolver.C
+++ b/src/coupledMatrix/coupledLduSolver/smoothSolver/coupledSmoothSolver.C
@@ -58,7 +58,7 @@ Foam::coupledSmoothSolver::coupledSmoothSolver
     const PtrList<FieldField<Field, scalar> >& bouCoeffs,
     const PtrList<FieldField<Field, scalar> >& intCoeffs,
     const lduInterfaceFieldPtrsListList& interfaces,
-    Istream& solverData
+    const dictionary& solverData
 )
 :
     coupledIterativeSolver
@@ -101,11 +101,11 @@ Foam::coupledSolverPerformance Foam::coupledSmoothSolver::solve
     {
         autoPtr<coupledLduSmoother> smootherPtr = coupledLduSmoother::New
         (
-            word(dict().lookup("smoother")),
             matrix_,
             bouCoeffs_,
             intCoeffs_,
-            interfaces_
+            interfaces_,
+            dict()
         );
 
         smootherPtr->smooth
@@ -145,11 +145,11 @@ Foam::coupledSolverPerformance Foam::coupledSmoothSolver::solve
         autoPtr<coupledLduSmoother> smootherPtr =
             coupledLduSmoother::New
             (
-                word(dict().lookup("smoother")),
                 matrix_,
                 bouCoeffs_,
                 intCoeffs_,
-                interfaces_
+                interfaces_,
+                dict()
             );
 
         // Smoothing loop
diff --git a/src/coupledMatrix/coupledLduSolver/smoothSolver/coupledSmoothSolver.H b/src/coupledMatrix/coupledLduSolver/smoothSolver/coupledSmoothSolver.H
index 9f8fe6a36..9cac5a3ba 100644
--- a/src/coupledMatrix/coupledLduSolver/smoothSolver/coupledSmoothSolver.H
+++ b/src/coupledMatrix/coupledLduSolver/smoothSolver/coupledSmoothSolver.H
@@ -96,7 +96,7 @@ public:
             const PtrList<FieldField<Field, scalar> >& bouCoeffs,
             const PtrList<FieldField<Field, scalar> >& intCoeffs,
             const lduInterfaceFieldPtrsListList& interfaces,
-            Istream& solverData
+            const dictionary& solverData
         );
 
 
diff --git a/src/decompositionMethods/Allwmake b/src/decompositionMethods/Allwmake
index e2612ef54..c0d1c9264 100755
--- a/src/decompositionMethods/Allwmake
+++ b/src/decompositionMethods/Allwmake
@@ -6,12 +6,7 @@ wmakeLnInclude decompositionMethods
 
 wmake libso scotchDecomp
 wmake libso metisDecomp
-
-if [ -d "$FOAM_MPI_LIBBIN" ]
-then
-    WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
-    wmake libso parMetisDecomp
-fi
+wmake libso parMetisDecomp
 
 wmake libso decompositionMethods
 
diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.H b/src/finiteArea/faMatrices/faMatrix/faMatrix.H
index 2955c7d57..0b3e3a1ee 100644
--- a/src/finiteArea/faMatrices/faMatrix/faMatrix.H
+++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.H
@@ -173,8 +173,8 @@ public:
         // Member functions
 
             //- Solve returning the solution statistics.
-            //  Solver controls read from Istream
-            lduSolverPerformance solve(Istream&);
+            //  Solver controls read from dictionary
+            lduSolverPerformance solve(const dictionary&);
 
             //- Solve returning the solution statistics.
             //  Solver controls read from faSolution
@@ -300,15 +300,15 @@ public:
 
             //- Construct and return the solver
             //  Solver controls read from Istream
-            autoPtr<faSolver> solver(Istream&);
+            autoPtr<faSolver> solver(const dictionary&);
 
             //- Construct and return the solver
-            //  Solver controls read from fvSolution
+            //  Solver controls read from faSolution
             autoPtr<faSolver> solver();
 
             //- Solve returning the solution statistics.
             //  Solver controls read Istream
-            lduSolverPerformance solve(Istream&);
+            lduSolverPerformance solve(const dictionary&);
 
             //- Solve returning the solution statistics.
             //  Solver controls read from faSolution
diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrixSolve.C b/src/finiteArea/faMatrices/faMatrix/faMatrixSolve.C
index f792c550e..1066a0dea 100644
--- a/src/finiteArea/faMatrices/faMatrix/faMatrixSolve.C
+++ b/src/finiteArea/faMatrices/faMatrix/faMatrixSolve.C
@@ -27,8 +27,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 namespace Foam
 {
 
@@ -54,11 +52,11 @@ void faMatrix<Type>::setComponentReference
 
 
 template<class Type>
-lduSolverPerformance faMatrix<Type>::solve(Istream& solverControls)
+lduSolverPerformance faMatrix<Type>::solve(const dictionary& solverControls)
 {
     if (debug)
     {
-        Info<< "faMatrix<Type>::solve(Istream& solverControls) : "
+        Info<< "faMatrix<Type>::solve(const dictionary&) : "
                "solving faMatrix<Type>"
             << endl;
     }
@@ -107,7 +105,7 @@ lduSolverPerformance faMatrix<Type>::solve(Istream& solverControls)
             bouCoeffsCmpt,
             intCoeffsCmpt,
             interfaces,
-            solverControls.rewind()
+            solverControls
         )->solve(psiCmpt, sourceCmpt, cmpt);
 
         solverPerf.print();
@@ -134,20 +132,20 @@ lduSolverPerformance faMatrix<Type>::solve(Istream& solverControls)
 template<class Type>
 autoPtr<typename faMatrix<Type>::faSolver> faMatrix<Type>::solver()
 {
-    return solver(psi_.mesh().solver(psi_.name()));
+    return solver(psi_.mesh().solverDict(psi_.name()));
 }
 
 template<class Type>
 lduSolverPerformance faMatrix<Type>::faSolver::solve()
 {
-    return solve(psi_.mesh().solver(psi_.name()));
+    return solve(psi_.mesh().solverDict(psi_.name()));
 }
 
 
 template<class Type>
 lduSolverPerformance faMatrix<Type>::solve()
 {
-    return solve(psi_.mesh().solver(psi_.name()));
+    return solve(psi_.mesh().solverDict(psi_.name()));
 }
 
 
diff --git a/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C b/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
index 985a076d9..7f7fb7fb1 100644
--- a/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
+++ b/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
@@ -61,12 +61,12 @@ void faMatrix<scalar>::setComponentReference
 template<>
 autoPtr<faMatrix<scalar>::faSolver> faMatrix<scalar>::solver
 (
-    Istream& solverControls
+    const dictionary& solverControls
 )
 {
     if (debug)
     {
-        Info<< "faMatrix<scalar>::solver(Istream& solverControls) : "
+        Info<< "faMatrix<scalar>::solver(const dictionary&) : "
                "solver for faMatrix<scalar>"
             << endl;
     }
@@ -104,7 +104,7 @@ autoPtr<faMatrix<scalar>::faSolver> faMatrix<scalar>::solver
 template<>
 lduSolverPerformance faMatrix<scalar>::faSolver::solve
 (
-    Istream& solverControls
+    const dictionary& solverControls
 )
 {
     scalarField saveDiag = faMat_.diag();
@@ -114,7 +114,7 @@ lduSolverPerformance faMatrix<scalar>::faSolver::solve
     faMat_.addBoundarySource(totalSource, false);
 
     solver_->read(solverControls);
-    lduSolverPerformance solverPerf = 
+    lduSolverPerformance solverPerf =
         solver_->solve(faMat_.psi().internalField(), totalSource);
 
     solverPerf.print();
@@ -128,11 +128,14 @@ lduSolverPerformance faMatrix<scalar>::faSolver::solve
 
 
 template<>
-lduSolverPerformance faMatrix<scalar>::solve(Istream& solverControls)
+lduSolverPerformance faMatrix<scalar>::solve
+(
+    const dictionary& solverControls
+)
 {
     if (debug)
     {
-        Info<< "faMatrix<scalar>::solve(Istream& solverControls) : "
+        Info<< "faMatrix<scalar>::solve(const dictionary&) : "
                "solving faMatrix<scalar>"
             << endl;
     }
diff --git a/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.H b/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.H
index d4534d5a2..af59ec90d 100644
--- a/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.H
+++ b/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.H
@@ -56,13 +56,19 @@ void faMatrix<scalar>::setComponentReference
 );
 
 template<>
-autoPtr<faMatrix<scalar>::faSolver> faMatrix<scalar>::solver(Istream&);
+autoPtr<faMatrix<scalar>::faSolver> faMatrix<scalar>::solver
+(
+    const dictionary&
+);
 
 template<>
-lduSolverPerformance faMatrix<scalar>::faSolver::solve(Istream&);
+lduSolverPerformance faMatrix<scalar>::faSolver::solve
+(
+    const dictionary&
+);
 
 template<>
-lduSolverPerformance faMatrix<scalar>::solve(Istream&);
+lduSolverPerformance faMatrix<scalar>::solve(const dictionary&);
 
 // Return the matrix residual
 template<>
diff --git a/src/finiteArea/finiteArea/fam/famLaplacian.C b/src/finiteArea/finiteArea/fam/famLaplacian.C
index 3b5e91fdc..32be1801a 100644
--- a/src/finiteArea/finiteArea/fam/famLaplacian.C
+++ b/src/finiteArea/finiteArea/fam/famLaplacian.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    
-
 \*---------------------------------------------------------------------------*/
 
 #include "areaFields.H"
diff --git a/src/finiteVolume/cfdTools/compressible/compressibleCreatePhi.H b/src/finiteVolume/cfdTools/compressible/compressibleCreatePhi.H
index 3717ea9f1..38454ff89 100644
--- a/src/finiteVolume/cfdTools/compressible/compressibleCreatePhi.H
+++ b/src/finiteVolume/cfdTools/compressible/compressibleCreatePhi.H
@@ -30,8 +30,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef compressibleCreatePhi_H
-#define compressibleCreatePhi_H
+// Include protection not allowed.  HJ, 22/Sep/2010
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,8 +49,5 @@ surfaceScalarField phi
     linearInterpolate(rho*U) & mesh.Sf()
 );
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/incompressible/createPhi.H b/src/finiteVolume/cfdTools/incompressible/createPhi.H
index 355d6b4ca..0916ae5e3 100644
--- a/src/finiteVolume/cfdTools/incompressible/createPhi.H
+++ b/src/finiteVolume/cfdTools/incompressible/createPhi.H
@@ -30,8 +30,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef createPhi_H
-#define createPhi_H
+// Include protection not allowed.  HJ, 22/Sep/2010
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,8 +49,5 @@ surfaceScalarField phi
     linearInterpolate(U) & mesh.Sf()
 );
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/incompressible/createPhiv.H b/src/finiteVolume/cfdTools/incompressible/createPhiv.H
index 7fcb7cef7..71ec31008 100644
--- a/src/finiteVolume/cfdTools/incompressible/createPhiv.H
+++ b/src/finiteVolume/cfdTools/incompressible/createPhiv.H
@@ -30,8 +30,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef createPhiv_H
-#define createPhiv_H
+// Include protection not allowed.  HJ, 22/Sep/2010
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,8 +49,5 @@ surfaceScalarField phiv
     linearInterpolate(U) & mesh.Sf()
 );
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
 
 // ************************************************************************* //
diff --git a/src/tetDecompositionFiniteElement/tetFemMethod/tetFem.C b/src/tetDecompositionFiniteElement/tetFemMethod/tetFem.C
index 435c48aaf..9d2dbb849 100644
--- a/src/tetDecompositionFiniteElement/tetFemMethod/tetFem.C
+++ b/src/tetDecompositionFiniteElement/tetFemMethod/tetFem.C
@@ -52,7 +52,7 @@ tmp<tetFemMatrix<Type> > tetFem::laplacian
         (
             "gamma",
             vf.time().constant(),
-            vf.mesh(),
+            vf.db(),
             IOobject::NO_READ
         ),
         vf.mesh(),
@@ -217,7 +217,7 @@ tmp<tetFemMatrix<Type> > tetFem::laplacian
         (
             "gamma",
             vf.instance(),
-            vf.mesh(),
+            vf.db(),
             IOobject::NO_READ
         ),
         vf.mesh(),
@@ -240,7 +240,7 @@ tmp<tetFemMatrix<Type> > tetFem::laplacianTranspose
         (
             "gamma",
             vf.time().constant(),
-            vf.mesh(),
+            vf.db(),
             IOobject::NO_READ
         ),
         vf.mesh(),
@@ -409,7 +409,7 @@ tmp<tetFemMatrix<Type> > tetFem::laplacianTranspose
         (
             gamma.name(),
             vf.instance(),
-            vf.mesh(),
+            vf.db(),
             IOobject::NO_READ
         ),
         vf.mesh(),
@@ -574,7 +574,7 @@ tmp<tetFemMatrix<Type> > tetFem::laplacianTrace
         (
             gamma.name(),
             vf.instance(),
-            vf.mesh(),
+            vf.db(),
             IOobject::NO_READ
         ),
         vf.mesh(),
@@ -597,7 +597,7 @@ tmp<tetFemMatrix<Type> > tetFem::laplacianTrace
         (
             "1",
             vf.instance(),
-            vf.mesh(),
+            vf.db(),
             IOobject::NO_READ
         ),
         vf.mesh(),
diff --git a/src/transportModels/Allwmake b/src/transportModels/Allwmake
index 7272653e0..d3f6f037f 100755
--- a/src/transportModels/Allwmake
+++ b/src/transportModels/Allwmake
@@ -4,6 +4,7 @@ set -x
 
 wmake libso incompressible
 wmake libso interfaceProperties
+wmake libso viscoelastic
 # wmake libso compressible
 
 # ----------------------------------------------------------------- end-of-file