From e74451a7700739750fec88c5e1c848a3b2509c30 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 21 Feb 2014 16:17:23 +0000
Subject: [PATCH 01/13] BUG: processorCyclic - updated group naming on
 consttuct from components

---
 .../polyPatches/constraint/processor/processorPolyPatch.C  | 7 ++++---
 .../polyPatches/constraint/processor/processorPolyPatch.H  | 5 +++--
 .../constraint/processorCyclic/processorCyclicPolyPatch.C  | 6 ++++--
 .../constraint/processorCyclic/processorCyclicPolyPatch.H  | 3 ++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 37e2fb4d..c72f4ea7 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,10 +56,11 @@ Foam::processorPolyPatch::processorPolyPatch
     const polyBoundaryMesh& bm,
     const int myProcNo,
     const int neighbProcNo,
-    const transformType transform
+    const transformType transform,
+    const word& patchType
 )
 :
-    coupledPolyPatch(name, size, start, index, bm, typeName, transform),
+    coupledPolyPatch(name, size, start, index, bm, patchType, transform),
     myProcNo_(myProcNo),
     neighbProcNo_(neighbProcNo),
     neighbFaceCentres_(),
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
index 6a3d202a..63c2a7dd 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,8 @@ public:
             const polyBoundaryMesh& bm,
             const int myProcNo,
             const int neighbProcNo,
-            const transformType transform = UNKNOWN  // transformation type
+            const transformType transform = UNKNOWN,  // transformation type
+            const word& patchType = typeName
         );
 
         //- Construct from dictionary
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
index 927c0e80..e2d86a49 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
@@ -49,7 +49,8 @@ Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
     const int myProcNo,
     const int neighbProcNo,
     const word& referPatchName,
-    const transformType transform
+    const transformType transform,
+    const word& patchType
 )
 :
     processorPolyPatch
@@ -61,7 +62,8 @@ Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
         bm,
         myProcNo,
         neighbProcNo,
-        transform
+        transform,
+        patchType
     ),
     referPatchName_(referPatchName),
     tag_(-1),
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
index 2bfc2c98..3ede0219 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
@@ -122,7 +122,8 @@ public:
             const int myProcNo,
             const int neighbProcNo,
             const word& referPatchName,
-            const transformType transform = UNKNOWN
+            const transformType transform = UNKNOWN,
+            const word& patchType = typeName
         );
 
         //- Construct from dictionary

From 9e38fbdbe4aa38f13e15e8ad9a5c99f1f3e3e6be Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 21 Feb 2014 16:18:00 +0000
Subject: [PATCH 02/13] BUG: decomposePar - updated to handle multiple
 processor cyclic patches - mantis 879

---
 .../decomposePar/domainDecomposition.H        |  23 ++-
 .../decomposePar/domainDecompositionMesh.C    | 163 ++++++++----------
 .../domainDecompositionTemplates.C            | 125 ++++++++++++++
 3 files changed, 216 insertions(+), 95 deletions(-)
 create mode 100644 applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C

diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
index 9487aefe..21bc8e61 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,7 +130,7 @@ class domainDecomposition
         //- Append single element to list
         static void append(labelList&, const label);
 
-        //- Add face to interProcessor patch.
+        //- Add face to inter-processor patch
         void addInterProcFace
         (
             const label facei,
@@ -141,6 +141,19 @@ class domainDecomposition
             List<DynamicList<DynamicList<label> > >&
         ) const;
 
+        //- Generate sub patch info for processor cyclics
+        template <class BinaryOp>
+        void processInterCyclics
+        (
+            const polyBoundaryMesh& patches,
+            List<DynamicList<DynamicList<label> > >& interPatchFaces,
+            List<Map<label> >& procNbrToInterPatch,
+            List<labelListList>& subPatchIDs,
+            List<labelListList>& subPatchStarts,
+            bool owner,
+            BinaryOp bop
+        ) const;
+
 
 public:
 
@@ -187,6 +200,12 @@ public:
 } // End namespace Foam
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "domainDecompositionTemplates.C"
+#endif
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index 14512332..f5a76722 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,9 +32,7 @@ Description
 
 #include "domainDecomposition.H"
 #include "IOstreams.H"
-#include "SLPtrList.H"
 #include "boolList.H"
-#include "primitiveMesh.H"
 #include "cyclicPolyPatch.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -209,10 +207,11 @@ void Foam::domainDecomposition::decomposeMesh()
     // Done internal bits of the new mesh and the ordinary patches.
 
 
-    // Per processor, from neighbour processor to the interprocessorpatch that
-    // communicates with that neighbour.
+    // Per processor, from neighbour processor to the inter-processor patch
+    // that communicates with that neighbour
     List<Map<label> > procNbrToInterPatch(nProcs_);
-    // Per processor the faces per interprocessorpatch.
+
+    // Per processor the faces per inter-processor patch
     List<DynamicList<DynamicList<label> > > interPatchFaces(nProcs_);
 
     // Processor boundaries from internal faces
@@ -248,95 +247,73 @@ void Foam::domainDecomposition::decomposeMesh()
         subPatchStarts[procI].setSize(nInterfaces, labelList(1, label(0)));
     }
 
-    // Processor boundaries from split cyclics
-    forAll(patches, patchi)
-    {
-        if (isA<cyclicPolyPatch>(patches[patchi]))
-        {
-            const cyclicPolyPatch& pp = refCast<const cyclicPolyPatch>
-            (
-                patches[patchi]
-            );
 
-            // cyclic: check opposite side on this processor
-            const labelUList& patchFaceCells = pp.faceCells();
-            const labelUList& nbrPatchFaceCells =
-                pp.neighbPatch().faceCells();
+    // Special handling needed for the case that multiple processor cyclic
+    // patches are created on each local processor domain, e.g. if a 3x3 case
+    // is decomposed using the decomposition:
+    //
+    //              | 1 | 0 | 2 |
+    //  cyclic left | 2 | 0 | 1 | cyclic right
+    //              | 2 | 0 | 1 |
+    //
+    // - processors 1 and 2 will both have pieces of both cyclic left- and
+    //   right sub-patches present
+    // - the interface patch faces are stored in a single list, where each
+    //   sub-patch is referenced into the list using a patch start index and
+    //   size
+    // - if the patches are in order (in the boundary file) of left, right
+    //   - processor 1 will send: left, right
+    //   - processor 1 will need to receive in reverse order: right, left
+    //   - similarly for processor 2
+    // - the sub-patches are therefore generated in 4 passes of the patch lists
+    //   1. add faces from owner patch where local proc i < nbr proc i
+    //   2. add faces from nbr patch where local proc i < nbr proc i
+    //   3. add faces from owner patch where local proc i > nbr proc i
+    //   4. add faces from nbr patch where local proc i > nbr proc i
 
-            // Store old sizes. Used to detect which inter-proc patches
-            // have been added to.
-            labelListList oldInterfaceSizes(nProcs_);
-            forAll(oldInterfaceSizes, procI)
-            {
-                labelList& curOldSizes = oldInterfaceSizes[procI];
+    processInterCyclics
+    (
+        patches,
+        interPatchFaces,
+        procNbrToInterPatch,
+        subPatchIDs,
+        subPatchStarts,
+        true,
+        lessOp<label>()
+    );
 
-                curOldSizes.setSize(interPatchFaces[procI].size());
-                forAll(curOldSizes, interI)
-                {
-                    curOldSizes[interI] =
-                        interPatchFaces[procI][interI].size();
-                }
-            }
+    processInterCyclics
+    (
+        patches,
+        interPatchFaces,
+        procNbrToInterPatch,
+        subPatchIDs,
+        subPatchStarts,
+        false,
+        lessOp<label>()
+    );
 
-            // Add faces with different owner and neighbour processors
-            forAll(patchFaceCells, facei)
-            {
-                const label ownerProc = cellToProc_[patchFaceCells[facei]];
-                const label nbrProc = cellToProc_[nbrPatchFaceCells[facei]];
-                if (ownerProc != nbrProc)
-                {
-                    // inter - processor patch face found.
-                    addInterProcFace
-                    (
-                        pp.start()+facei,
-                        ownerProc,
-                        nbrProc,
-                        procNbrToInterPatch,
-                        interPatchFaces
-                    );
-                }
-            }
+    processInterCyclics
+    (
+        patches,
+        interPatchFaces,
+        procNbrToInterPatch,
+        subPatchIDs,
+        subPatchStarts,
+        false,
+        greaterOp<label>()
+    );
 
-            // 1. Check if any faces added to existing interfaces
-            forAll(oldInterfaceSizes, procI)
-            {
-                const labelList& curOldSizes = oldInterfaceSizes[procI];
-
-                forAll(curOldSizes, interI)
-                {
-                    label oldSz = curOldSizes[interI];
-                    if (interPatchFaces[procI][interI].size() > oldSz)
-                    {
-                        // Added faces to this interface. Add an entry
-                        append(subPatchIDs[procI][interI], patchi);
-                        append(subPatchStarts[procI][interI], oldSz);
-                    }
-                }
-            }
-
-            // 2. Any new interfaces
-            forAll(subPatchIDs, procI)
-            {
-                label nIntfcs = interPatchFaces[procI].size();
-                subPatchIDs[procI].setSize(nIntfcs, labelList(1, patchi));
-                subPatchStarts[procI].setSize(nIntfcs, labelList(1, label(0)));
-            }
-        }
-    }
-
-
-    // Shrink processor patch face addressing
-    forAll(interPatchFaces, procI)
-    {
-        DynamicList<DynamicList<label> >& curInterPatchFaces =
-            interPatchFaces[procI];
-
-        forAll(curInterPatchFaces, i)
-        {
-            curInterPatchFaces[i].shrink();
-        }
-        curInterPatchFaces.shrink();
-    }
+    processInterCyclics
+    (
+        patches,
+        interPatchFaces,
+        procNbrToInterPatch,
+        subPatchIDs,
+        subPatchStarts,
+        true,
+        greaterOp<label>()
+    );
 
 
     // Sort inter-proc patch by neighbour
@@ -356,18 +333,18 @@ void Foam::domainDecomposition::decomposeMesh()
         // Get sorted neighbour processors
         const Map<label>& curNbrToInterPatch = procNbrToInterPatch[procI];
         labelList nbrs = curNbrToInterPatch.toc();
+
         sortedOrder(nbrs, order);
 
         DynamicList<DynamicList<label> >& curInterPatchFaces =
             interPatchFaces[procI];
 
-        forAll(order, i)
+        forAll(nbrs, i)
         {
             const label nbrProc = nbrs[i];
             const label interPatch = curNbrToInterPatch[nbrProc];
 
-            procNeighbourProcessors_[procI][i] =
-                nbrProc;
+            procNeighbourProcessors_[procI][i] = nbrProc;
             procProcessorPatchSize_[procI][i] =
                 curInterPatchFaces[interPatch].size();
             procProcessorPatchStartIndex_[procI][i] =
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
new file mode 100644
index 00000000..c08be4f7
--- /dev/null
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "cyclicPolyPatch.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template <class BinaryOp>
+void Foam::domainDecomposition::processInterCyclics
+(
+    const polyBoundaryMesh& patches,
+    List<DynamicList<DynamicList<label> > >& interPatchFaces,
+    List<Map<label> >& procNbrToInterPatch,
+    List<labelListList>& subPatchIDs,
+    List<labelListList>& subPatchStarts,
+    bool owner,
+    BinaryOp bop
+) const
+{
+    // Processor boundaries from split cyclics
+    forAll(patches, patchi)
+    {
+        if (isA<cyclicPolyPatch>(patches[patchi]))
+        {
+            const cyclicPolyPatch& pp = refCast<const cyclicPolyPatch>
+            (
+                patches[patchi]
+            );
+
+            if (pp.owner() != owner)
+            {
+                continue;
+            }
+
+            // cyclic: check opposite side on this processor
+            const labelUList& patchFaceCells = pp.faceCells();
+            const labelUList& nbrPatchFaceCells =
+                pp.neighbPatch().faceCells();
+
+            // Store old sizes. Used to detect which inter-proc patches
+            // have been added to.
+            labelListList oldInterfaceSizes(nProcs_);
+            forAll(oldInterfaceSizes, procI)
+            {
+                labelList& curOldSizes = oldInterfaceSizes[procI];
+
+                curOldSizes.setSize(interPatchFaces[procI].size());
+                forAll(curOldSizes, interI)
+                {
+                    curOldSizes[interI] =
+                        interPatchFaces[procI][interI].size();
+                }
+            }
+
+            // Add faces with different owner and neighbour processors
+            forAll(patchFaceCells, facei)
+            {
+                const label ownerProc = cellToProc_[patchFaceCells[facei]];
+                const label nbrProc = cellToProc_[nbrPatchFaceCells[facei]];
+                if (bop(ownerProc, nbrProc))
+                {
+                    // inter - processor patch face found.
+                    addInterProcFace
+                    (
+                        pp.start()+facei,
+                        ownerProc,
+                        nbrProc,
+                        procNbrToInterPatch,
+                        interPatchFaces
+                    );
+                }
+            }
+
+            // 1. Check if any faces added to existing interfaces
+            forAll(oldInterfaceSizes, procI)
+            {
+                const labelList& curOldSizes = oldInterfaceSizes[procI];
+
+                forAll(curOldSizes, interI)
+                {
+                    label oldSz = curOldSizes[interI];
+                    if (interPatchFaces[procI][interI].size() > oldSz)
+                    {
+                        // Added faces to this interface. Add an entry
+                        append(subPatchIDs[procI][interI], patchi);
+                        append(subPatchStarts[procI][interI], oldSz);
+                    }
+                }
+            }
+
+            // 2. Any new interfaces
+            forAll(subPatchIDs, procI)
+            {
+                label nIntfcs = interPatchFaces[procI].size();
+                subPatchIDs[procI].setSize(nIntfcs, labelList(1, patchi));
+                subPatchStarts[procI].setSize(nIntfcs, labelList(1, label(0)));
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //

From 8cdb43115912fffb3d24f77bc31601cba0f6c199 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 24 Feb 2014 09:09:54 +0000
Subject: [PATCH 03/13] BUG: faceSource - incorrect treatment for cyclic -
 mantis #1092 #1181

---
 .../field/fieldValues/faceSource/faceSource.C               | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
index ea38597a..ba1e110c 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
@@ -188,11 +188,7 @@ void Foam::fieldValues::faceSource::setPatchFaces()
     const polyPatch& pp = mesh().boundaryMesh()[patchId];
 
     label nFaces = pp.size();
-    if (isA<cyclicPolyPatch>(pp))
-    {
-        nFaces /= 2;
-    }
-    else if (isA<emptyPolyPatch>(pp))
+    if (isA<emptyPolyPatch>(pp))
     {
         nFaces = 0;
     }

From 4a46e611aca77163e97757abd92be423682275fd Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 24 Feb 2014 09:12:33 +0000
Subject: [PATCH 04/13] BUG: helpTypes: incorrect libs - mantis #1182

---
 .../utilities/miscellaneous/foamHelp/helpTypes/Make/options     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options b/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options
index 8b00d9a6..01b25c79 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options
@@ -1,7 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lfiniteVolume \
     -lincompressibleTurbulenceModel \
     -lcompressibleTurbulenceModel \

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

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

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

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

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

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

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

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

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

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

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

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

From 8fa487c31a953f8bf81a11a2d2704f052c6bde0b Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 26 Feb 2014 13:44:22 +0000
Subject: [PATCH 09/13] BUG: AMI with low-weight correction - further wrapping
 around interpolation - mantis #1174

---
 .../polyPatches/polyPatch/polyPatch.H         | 14 +++++-
 .../jumpCyclicAMI/jumpCyclicAMIFvPatchField.C | 36 +++++++++++---
 .../fixedJumpAMI/fixedJumpAMIFvPatchField.C   | 15 +++++-
 .../constraint/cyclicAMI/cyclicAMIFvPatch.C   | 48 ++++++++++++-------
 .../constraint/cyclicAMI/cyclicAMIFvPatch.H   | 12 +++--
 .../cyclicAMIGAMGInterface.H                  |  4 +-
 .../algorithms/MeshWave/FaceCellWave.C        | 17 ++++++-
 7 files changed, 111 insertions(+), 35 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index 94c743f7..357e81c9 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -316,6 +316,16 @@ public:
         //- Return a list of all the constraint patch types
         static wordList constraintTypes();
 
+        //- Extract face cell data
+        template<class T>
+        const UIndirectList<T> patchInternalList
+        (
+            const UList<T>& internalValues
+        ) const
+        {
+            return UIndirectList<T>(internalValues, faceCells());
+        }
+
         //- Slice list to patch
         template<class T>
         const typename List<T>::subList patchSlice(const UList<T>& l) const
@@ -343,7 +353,7 @@ public:
             //- Return face normals
             const vectorField::subField faceAreas() const;
 
-            //- Return face neighbour cell centres
+            //- Return face cell centres
             tmp<vectorField> faceCellCentres() const;
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
index ff36ee97..7e13ba75 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,10 +99,21 @@ Foam::jumpCyclicAMIFvPatchField<Type>::patchNeighbourField() const
         this->cyclicAMIPatch().cyclicAMIPatch().neighbPatch().faceCells();
 
     Field<Type> pnf(iField, nbrFaceCells);
-    tmp<Field<Type> > tpnf
-    (
-        new Field<Type>(this->cyclicAMIPatch().interpolate(pnf))
-    );
+    tmp<Field<Type> > tpnf;
+
+    if (this->cyclicAMIPatch().applyLowWeightCorrection())
+    {
+        tpnf =
+            this->cyclicAMIPatch().interpolate
+            (
+                pnf,
+                this->patchInternalField()()
+            );
+    }
+    else
+    {
+        tpnf = this->cyclicAMIPatch().interpolate(pnf);
+    }
 
     if (this->doTransform())
     {
@@ -157,7 +168,20 @@ void Foam::jumpCyclicAMIFvPatchField<Type>::updateInterfaceMatrix
 
     Field<Type> pnf(psiInternal, nbrFaceCells);
 
-    pnf = this->cyclicAMIPatch().interpolate(pnf);
+    if (this->cyclicAMIPatch().applyLowWeightCorrection())
+    {
+        pnf =
+            this->cyclicAMIPatch().interpolate
+            (
+                pnf,
+                this->patchInternalField()()
+            );
+
+    }
+    else
+    {
+        pnf = this->cyclicAMIPatch().interpolate(pnf);
+    }
 
     // only apply jump to original field
     if (&psiInternal == &this->internalField())
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
index cc9717ff..21b62c6e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,7 +123,18 @@ Foam::tmp<Foam::Field<Type> > Foam::fixedJumpAMIFvPatchField<Type>::jump() const
                 this->neighbourPatchField()
             );
 
-        return this->cyclicAMIPatch().interpolate(nbrPatch.jump());
+        if (this->cyclicAMIPatch().applyLowWeightCorrection())
+        {
+            return this->cyclicAMIPatch().interpolate
+            (
+                nbrPatch.jump(),
+                Field<Type>(this->size(), pTraits<Type>::zero)
+            );
+        }
+        else
+        {
+            return this->cyclicAMIPatch().interpolate(nbrPatch.jump());
+        }
     }
 }
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
index abf1a6b3..584e9d77 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
@@ -53,14 +53,22 @@ void Foam::cyclicAMIFvPatch::makeWeights(scalarField& w) const
 
         const scalarField deltas(nf() & fvPatch::delta());
 
-        const scalarField nbrDeltas
-        (
-            interpolate
-            (
-                nbrPatch.nf() & nbrPatch.fvPatch::delta(),
-                scalarField(this->size(), 1.0)
-            )
-        );
+        tmp<scalarField> tnbrDeltas;
+        if (applyLowWeightCorrection())
+        {
+            tnbrDeltas =
+                interpolate
+                (
+                    nbrPatch.nf() & nbrPatch.fvPatch::delta(),
+                    scalarField(this->size(), 1.0)
+                );
+        }
+        else
+        {
+            tnbrDeltas = interpolate(nbrPatch.nf() & nbrPatch.fvPatch::delta());
+        }
+
+        const scalarField& nbrDeltas = tnbrDeltas();
 
         forAll(deltas, faceI)
         {
@@ -86,14 +94,22 @@ Foam::tmp<Foam::vectorField> Foam::cyclicAMIFvPatch::delta() const
     {
         const vectorField patchD(fvPatch::delta());
 
-        const vectorField nbrPatchD
-        (
-            interpolate
-            (
-                nbrPatch.fvPatch::delta(),
-                vectorField(this->size(), vector::zero)
-            )
-        );
+        tmp<vectorField> tnbrPatchD;
+        if (applyLowWeightCorrection())
+        {
+            tnbrPatchD =
+                interpolate
+                (
+                    nbrPatch.fvPatch::delta(),
+                    vectorField(this->size(), vector::zero)
+                );
+        }
+        else
+        {
+            tnbrPatchD = interpolate(nbrPatch.fvPatch::delta());
+        }
+
+        const vectorField& nbrPatchD = tnbrPatchD();
 
         tmp<vectorField> tpdv(new vectorField(patchD.size()));
         vectorField& pdv = tpdv();
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H
index 0263fb52..6ba8ed43 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H
@@ -120,6 +120,13 @@ public:
                 return cyclicAMIPolyPatch_.AMI();
             }
 
+            //- Return true if applying the low weight correction
+            virtual bool applyLowWeightCorrection() const
+            {
+                return cyclicAMIPolyPatch_.applyLowWeightCorrection();
+            }
+
+
             //- Are the cyclic planes parallel
             virtual bool parallel() const
             {
@@ -154,11 +161,6 @@ public:
             //- Return delta (P to N) vectors across coupled patch
             virtual tmp<vectorField> delta() const;
 
-            bool applyLowWeightCorrection() const
-            {
-                return cyclicAMIPolyPatch_.applyLowWeightCorrection();
-            }
-
             template<class Type>
             tmp<Field<Type> > interpolate
             (
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
index ce323087..c05773af 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ public:
 
         //- Cyclic interface functions
 
-            //- Return neigbour processor number
+            //- Return neighbour processor number
             virtual label neighbPatchID() const
             {
                 return fineCyclicAMIInterface_.neighbPatchID();
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.C b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
index 946e23e5..9b2a68fc 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.C
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -746,7 +746,20 @@ void Foam::FaceCellWave<Type, TrackingData>::handleAMICyclicPatches()
 
                 // Transfer sendInfo to cycPatch
                 combine<Type, TrackingData> cmb(*this, cycPatch);
-                cycPatch.interpolate(sendInfo, cmb, receiveInfo);
+
+                if (cycPatch.applyLowWeightCorrection())
+                {
+                    List<Type> defVals
+                    (
+                        cycPatch.patchInternalList(allCellInfo_)
+                    );
+
+                    cycPatch.interpolate(sendInfo, cmb, receiveInfo, defVals);
+                }
+                else
+                {
+                    cycPatch.interpolate(sendInfo, cmb, receiveInfo);
+                }
             }
 
             // Apply transform to received data for non-parallel planes

From 93cfee93f8555ed28008f44366718ff0df8e138d Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 26 Feb 2014 13:47:33 +0000
Subject: [PATCH 10/13] BUG: function objects - updated writeFileHeader for
 some objects - mantis #1193

---
 src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C | 3 ++-
 .../utilities/DESModelRegions/DESModelRegions.C                | 1 +
 .../utilities/wallShearStress/wallShearStress.C                | 1 +
 .../functionObjects/utilities/yPlusLES/yPlusLES.C              | 1 +
 .../functionObjects/utilities/yPlusRAS/yPlusRAS.C              | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
index f497c618..678ffad4 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,6 +43,7 @@ void Foam::cloudInfo::writeFileHeader(const label i)
     writeCommented(file(), "Time");
     writeTabbed(file(), "nParcels");
     writeTabbed(file(), "mass");
+    file() << endl;
 }
 
 
diff --git a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
index 0bfbc941..c642e5e6 100644
--- a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
+++ b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
@@ -47,6 +47,7 @@ void Foam::DESModelRegions::writeFileHeader(const label i)
     writeCommented(file(), "Time");
     writeTabbed(file(), "LES");
     writeTabbed(file(), "RAS");
+    file() << endl;
 }
 
 
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
index 64255a7e..00647d14 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
@@ -48,6 +48,7 @@ void Foam::wallShearStress::writeFileHeader(const label i)
     writeTabbed(file(), "patch");
     writeTabbed(file(), "min");
     writeTabbed(file(), "max");
+    file() << endl;
 }
 
 
diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C
index a372da08..705df6d9 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C
+++ b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C
@@ -50,6 +50,7 @@ void Foam::yPlusLES::writeFileHeader(const label i)
     writeTabbed(file(), "min");
     writeTabbed(file(), "max");
     writeTabbed(file(), "average");
+    file() << endl;
 }
 
 
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
index f093306b..68125069 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
@@ -51,6 +51,7 @@ void Foam::yPlusRAS::writeFileHeader(const label i)
     writeTabbed(file(), "min");
     writeTabbed(file(), "max");
     writeTabbed(file(), "average");
+    file() << endl;
 }
 
 

From 7e5903edd48a8e9cea8dc77581017ac20f497ea4 Mon Sep 17 00:00:00 2001
From: william <william>
Date: Wed, 26 Feb 2014 16:45:46 +0000
Subject: [PATCH 11/13] ENH: driftFluxFoam: made viscosity and relative
 velocity modelling run-time selectable

---
 .../multiphase/driftFluxFoam/Allwclean        |   9 +
 .../solvers/multiphase/driftFluxFoam/Allwmake |   9 +
 .../multiphase/driftFluxFoam/Make/options     |  12 +-
 .../solvers/multiphase/driftFluxFoam/UEqn.H   |   6 +-
 .../driftFluxFoam/alphaEqnSubCycle.H          |   2 +-
 .../multiphase/driftFluxFoam/calcVdj.H        |  20 --
 .../driftFluxFoam/correctViscosity.H          |  39 ----
 .../multiphase/driftFluxFoam/createFields.H   | 132 +++---------
 .../multiphase/driftFluxFoam/driftFluxFoam.C  |  10 +-
 .../multiphase/driftFluxFoam/kEpsilon.H       |   4 +-
 .../driftFluxFoam/plasticViscosity.H          |  21 --
 .../relativeVelocityModels/Make/files         |   5 +
 .../relativeVelocityModels/Make/options       |  10 +
 .../relativeVelocityModels/general/general.C  |  78 +++++++
 .../relativeVelocityModels/general/general.H  | 106 ++++++++++
 .../relativeVelocityModel.C                   | 175 +++++++++++++++
 .../relativeVelocityModel.H                   | 158 ++++++++++++++
 .../relativeVelocityModels/simple/simple.C    |  74 +++++++
 .../relativeVelocityModels/simple/simple.H    | 103 +++++++++
 .../BinghamPlastic/BinghamPlastic.C           | 131 ++++++++++++
 .../BinghamPlastic/BinghamPlastic.H           | 122 +++++++++++
 .../driftFluxFoam/viscosityModels/Make/files  |   4 +
 .../viscosityModels/Make/options              |  10 +
 .../viscosityModels/plastic/plastic.C         | 200 ++++++++++++++++++
 .../viscosityModels/plastic/plastic.H         | 158 ++++++++++++++
 .../multiphase/driftFluxFoam/wallFunctions.H  |   4 +-
 .../multiphase/driftFluxFoam/wallViscosity.H  |   7 +-
 .../multiphase/driftFluxFoam/yieldStress.H    |  27 ---
 .../incompressibleTwoPhaseMixture.C           |   9 +-
 .../incompressibleTwoPhaseMixture.H           |  11 +-
 .../multiphase/driftFluxFoam/ras/dahl/0/U     |   2 +-
 .../ras/dahl/0/{alpha1 => alpha.sludge}       |   4 +-
 .../driftFluxFoam/ras/dahl/0/epsilon          |   2 +-
 .../multiphase/driftFluxFoam/ras/dahl/0/k     |   2 +-
 .../multiphase/driftFluxFoam/ras/dahl/0/p_rgh |   2 +-
 .../ras/dahl/constant/RASProperties           |   2 +-
 .../driftFluxFoam/ras/dahl/constant/g         |   2 +-
 .../ras/dahl/constant/polyMesh/blockMeshDict  |   2 +-
 .../ras/dahl/constant/polyMesh/boundary       |   2 +-
 .../ras/dahl/constant/transportProperties     |  64 +++---
 .../driftFluxFoam/ras/dahl/system/controlDict |   2 +-
 .../driftFluxFoam/ras/dahl/system/fvSchemes   |  10 +-
 .../driftFluxFoam/ras/dahl/system/fvSolution  |   6 +-
 .../driftFluxFoam/ras/mixerVessel2D/0/U       |   2 +-
 .../mixerVessel2D/0/{alpha1 => alpha.sludge}  |   4 +-
 .../driftFluxFoam/ras/mixerVessel2D/0/epsilon |   2 +-
 .../driftFluxFoam/ras/mixerVessel2D/0/k       |   2 +-
 .../driftFluxFoam/ras/mixerVessel2D/0/p_rgh   |   2 +-
 .../ras/mixerVessel2D/constant/RASProperties  |   2 +-
 .../ras/mixerVessel2D/constant/g              |   2 +-
 .../constant/polyMesh/blockMeshDict.m4        |   2 +-
 .../constant/transportProperties              |  64 +++---
 .../ras/mixerVessel2D/system/controlDict      |   2 +-
 .../ras/mixerVessel2D/system/fvOptions        |   2 +-
 .../ras/mixerVessel2D/system/fvSchemes        |  10 +-
 .../ras/mixerVessel2D/system/fvSolution       |   6 +-
 .../ras/mixerVessel2D/system/setFieldsDict    |   2 +-
 .../ras/mixerVessel2D/system/topoSetDict      |   2 +-
 .../multiphase/driftFluxFoam/ras/tank3D/0/U   |   2 +-
 .../ras/tank3D/0/{alpha1 => alpha.sludge}     |   4 +-
 .../driftFluxFoam/ras/tank3D/0/epsilon        |   2 +-
 .../multiphase/driftFluxFoam/ras/tank3D/0/k   |   2 +-
 .../driftFluxFoam/ras/tank3D/0/p_rgh          |   2 +-
 .../ras/tank3D/constant/RASProperties         |   2 +-
 .../driftFluxFoam/ras/tank3D/constant/g       |   2 +-
 .../ras/tank3D/constant/polyMesh/boundary     |   2 +-
 .../ras/tank3D/constant/transportProperties   |  64 +++---
 .../ras/tank3D/system/controlDict             |   2 +-
 .../driftFluxFoam/ras/tank3D/system/fvSchemes |  10 +-
 .../ras/tank3D/system/fvSolution              |   6 +-
 70 files changed, 1585 insertions(+), 379 deletions(-)
 create mode 100755 applications/solvers/multiphase/driftFluxFoam/Allwclean
 create mode 100755 applications/solvers/multiphase/driftFluxFoam/Allwmake
 delete mode 100644 applications/solvers/multiphase/driftFluxFoam/calcVdj.H
 delete mode 100644 applications/solvers/multiphase/driftFluxFoam/correctViscosity.H
 delete mode 100644 applications/solvers/multiphase/driftFluxFoam/plasticViscosity.H
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/files
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.C
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.H
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/simple/simple.C
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/simple/simple.H
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/viscosityModels/BinghamPlastic/BinghamPlastic.C
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/viscosityModels/BinghamPlastic/BinghamPlastic.H
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/viscosityModels/Make/files
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/viscosityModels/Make/options
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/viscosityModels/plastic/plastic.C
 create mode 100644 applications/solvers/multiphase/driftFluxFoam/viscosityModels/plastic/plastic.H
 delete mode 100644 applications/solvers/multiphase/driftFluxFoam/yieldStress.H
 rename tutorials/multiphase/driftFluxFoam/ras/dahl/0/{alpha1 => alpha.sludge} (93%)
 rename tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/{alpha1 => alpha.sludge} (91%)
 rename tutorials/multiphase/driftFluxFoam/ras/tank3D/0/{alpha1 => alpha.sludge} (95%)

diff --git a/applications/solvers/multiphase/driftFluxFoam/Allwclean b/applications/solvers/multiphase/driftFluxFoam/Allwclean
new file mode 100755
index 00000000..3254f968
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/Allwclean
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wclean libso viscosityModels
+wclean libso relativeVelocityModels
+wclean
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/driftFluxFoam/Allwmake b/applications/solvers/multiphase/driftFluxFoam/Allwmake
new file mode 100755
index 00000000..6e719c51
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/Allwmake
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake libso viscosityModels
+wmake libso relativeVelocityModels
+wmake
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/driftFluxFoam/Make/options b/applications/solvers/multiphase/driftFluxFoam/Make/options
index ce089874..b97b1fd5 100644
--- a/applications/solvers/multiphase/driftFluxFoam/Make/options
+++ b/applications/solvers/multiphase/driftFluxFoam/Make/options
@@ -2,10 +2,18 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude
+    -I$(LIB_SRC)/fvOptions/lnInclude \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
+    -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+    -I./relativeVelocityModels/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \
-    -lfvOptions
+    -lfvOptions \
+    -lincompressibleTransportModels \
+    -ldriftFluxTransportModels \
+    -ldriftFluxRelativeVelocityModels
diff --git a/applications/solvers/multiphase/driftFluxFoam/UEqn.H b/applications/solvers/multiphase/driftFluxFoam/UEqn.H
index 010417a0..8933a082 100644
--- a/applications/solvers/multiphase/driftFluxFoam/UEqn.H
+++ b/applications/solvers/multiphase/driftFluxFoam/UEqn.H
@@ -4,11 +4,7 @@
     (
         fvm::ddt(rho, U)
       + fvm::div(rhoPhi, U)
-      + fvc::div
-        (
-            (alpha1/(scalar(1.001) - alpha1))*((rho2*rho1)/rho)*Vdj*Vdj,
-            "div(phiVdj,Vdj)"
-        )
+      + fvc::div(uRelModel.tau(), "div(phiUkm,Ukm)")
       - fvm::laplacian(muEff, U)
       - fvc::div(muEff*dev2(T(fvc::grad(U))))
      ==
diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
index f134702c..218ef2d9 100644
--- a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
@@ -13,7 +13,7 @@
 
     surfaceScalarField phir
     (
-        rho2*(mesh.Sf() & fvc::interpolate(Vdj/rho))
+        mesh.Sf() & fvc::interpolate(uRelModel.Udm())
     );
 
     if (nAlphaSubCycles > 1)
diff --git a/applications/solvers/multiphase/driftFluxFoam/calcVdj.H b/applications/solvers/multiphase/driftFluxFoam/calcVdj.H
deleted file mode 100644
index cf02fafd..00000000
--- a/applications/solvers/multiphase/driftFluxFoam/calcVdj.H
+++ /dev/null
@@ -1,20 +0,0 @@
-if (VdjModel == "general")
-{
-    Vdj = V0*
-    (
-        exp(-a*max(alpha1 - alphaMin, scalar(0)))
-      - exp(-a1*max(alpha1 - alphaMin, scalar(0)))
-    );
-}
-else if (VdjModel == "simple")
-{
-    Vdj = V0*pow(10.0, -a*max(alpha1, scalar(0)));
-}
-else
-{
-    FatalErrorIn(args.executable())
-        << "Unknown VdjModel : " << VdjModel
-        << abort(FatalError);
-}
-
-Vdj.correctBoundaryConditions();
diff --git a/applications/solvers/multiphase/driftFluxFoam/correctViscosity.H b/applications/solvers/multiphase/driftFluxFoam/correctViscosity.H
deleted file mode 100644
index 38c6f804..00000000
--- a/applications/solvers/multiphase/driftFluxFoam/correctViscosity.H
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    mul = muc +
-        plasticViscosity
-        (
-            plasticViscosityCoeff,
-            plasticViscosityExponent,
-            alpha1
-        );
-
-    if (BinghamPlastic)
-    {
-        volScalarField tauy = yieldStress
-        (
-            yieldStressCoeff,
-            yieldStressExponent,
-            yieldStressOffset,
-            alpha1
-        );
-
-        mul =
-            tauy/
-            (
-                mag(fvc::grad(U))
-              + 1.0e-4*
-                (
-                    tauy
-                  + dimensionedScalar
-                    (
-                        "deltaTauy",
-                        tauy.dimensions(),
-                        1.0e-15
-                    )
-                )/mul
-            )
-          + mul;
-    }
-
-    mul = min(mul, muMax);
-}
diff --git a/applications/solvers/multiphase/driftFluxFoam/createFields.H b/applications/solvers/multiphase/driftFluxFoam/createFields.H
index 01917ba2..13a5cf81 100644
--- a/applications/solvers/multiphase/driftFluxFoam/createFields.H
+++ b/applications/solvers/multiphase/driftFluxFoam/createFields.H
@@ -12,22 +12,6 @@
         mesh
     );
 
-    Info<< "Reading field alpha1\n" << endl;
-    volScalarField alpha1
-    (
-        IOobject
-        (
-            "alpha1",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    volScalarField alpha2("alpha2", scalar(1) - alpha1);
-
     Info<< "Reading field U\n" << endl;
     volVectorField U
     (
@@ -45,7 +29,17 @@
     #include "createPhi.H"
 
 
+    // Transport
+    // ~~~~~~~~~
+
     Info<< "Reading transportProperties\n" << endl;
+    incompressibleTwoPhaseMixture twoPhaseProperties(U, phi);
+
+    volScalarField& alpha1(twoPhaseProperties.alpha1());
+    volScalarField& alpha2(twoPhaseProperties.alpha2());
+
+    const dimensionedScalar& rho1 = twoPhaseProperties.rho1();
+    const dimensionedScalar& rho2 = twoPhaseProperties.rho2();
 
     IOdictionary transportProperties
     (
@@ -59,40 +53,7 @@
         )
     );
 
-
-    dimensionedScalar rho1(transportProperties.lookup("rho1"));
-    dimensionedScalar rho2(transportProperties.lookup("rho2"));
-
-    dimensionedScalar muc(transportProperties.lookup("muc"));
-    dimensionedScalar muMax(transportProperties.lookup("muMax"));
-
-    dimensionedScalar plasticViscosityCoeff
-    (
-        transportProperties.lookup("plasticViscosityCoeff")
-    );
-
-    dimensionedScalar plasticViscosityExponent
-    (
-        transportProperties.lookup("plasticViscosityExponent")
-    );
-
-    dimensionedScalar yieldStressCoeff
-    (
-        transportProperties.lookup("yieldStressCoeff")
-    );
-
-    dimensionedScalar yieldStressExponent
-    (
-        transportProperties.lookup("yieldStressExponent")
-    );
-
-    dimensionedScalar yieldStressOffset
-    (
-        transportProperties.lookup("yieldStressOffset")
-    );
-
-    Switch BinghamPlastic(transportProperties.lookup("BinghamPlastic"));
-
+    // Mixture density
     volScalarField rho
     (
         IOobject
@@ -121,63 +82,24 @@
         fvc::interpolate(rho)*phi
     );
 
-    Info<< "Calculating field mul\n" << endl;
-    volScalarField mul
+
+    // Relative Velocity
+    // ~~~~~~~~~~~~~~~~~
+
+    autoPtr<relativeVelocityModel> uRelModelPtr
     (
-        IOobject
+        relativeVelocityModel::New
         (
-            "mul",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        muc
-      + plasticViscosity
-        (
-            plasticViscosityCoeff,
-            plasticViscosityExponent,
-            alpha1
+            transportProperties,
+            twoPhaseProperties
         )
     );
 
-
-    Info<< "Initialising field Vdj\n" << endl;
-    volVectorField Vdj
-    (
-        IOobject
-        (
-            "Vdj",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        dimensionedVector("0.0", U.dimensions(), vector::zero),
-        U.boundaryField().types()
-    );
+    relativeVelocityModel& uRelModel(uRelModelPtr());
 
 
-    Info<< "Selecting Drift-Flux model " << endl;
-
-    const word VdjModel(transportProperties.lookup("VdjModel"));
-
-    Info<< tab << VdjModel << " selected\n" << endl;
-
-    const dictionary& VdjModelCoeffs
-    (
-        transportProperties.subDict(VdjModel + "Coeffs")
-    );
-
-    dimensionedVector V0(VdjModelCoeffs.lookup("V0"));
-
-    dimensionedScalar a(VdjModelCoeffs.lookup("a"));
-
-    dimensionedScalar a1(VdjModelCoeffs.lookup("a1"));
-
-    dimensionedScalar alphaMin(VdjModelCoeffs.lookup("alphaMin"));
-
+    // Turbulence
+    // ~~~~~~~~~~
 
     IOdictionary RASProperties
     (
@@ -284,7 +206,6 @@
             << "wallFunctionCoeffs" << wallFunctionDict << endl;
     }
 
-
     nearWallDist y(mesh);
 
     Info<< "Reading field k\n" << endl;
@@ -329,7 +250,6 @@
         Cmu*rho*sqr(k)/epsilon
     );
 
-
     Info<< "Calculating field muEff\n" << endl;
     volScalarField muEff
     (
@@ -341,10 +261,13 @@
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mut + mul
+        mut + twoPhaseProperties.mu()
     );
 
 
+    // Pressure
+    // ~~~~~~~~
+
     Info<< "Calculating field (g.h)f\n" << endl;
     volScalarField gh("gh", g & mesh.C());
     surfaceScalarField ghf("gh", g & mesh.Cf());
@@ -385,4 +308,7 @@
     }
 
 
+    // MULES Correction
+    // ~~~~~~~~~~~~~~~~
+
     tmp<surfaceScalarField> tphiAlphaCorr0;
diff --git a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
index 00e80087..72a86c6e 100644
--- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
+++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
@@ -36,12 +36,12 @@ Description
 #include "fvCFD.H"
 #include "CMULES.H"
 #include "subCycle.H"
+#include "incompressibleTwoPhaseMixture.H"
+#include "relativeVelocityModel.H"
 #include "nearWallDist.H"
 #include "wallFvPatch.H"
 #include "bound.H"
 #include "Switch.H"
-#include "plasticViscosity.H"
-#include "yieldStress.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
@@ -82,9 +82,11 @@ int main(int argc, char *argv[])
         {
             #include "alphaControls.H"
 
-            #include "calcVdj.H"
+            uRelModel.update();
+
             #include "alphaEqnSubCycle.H"
-            #include "correctViscosity.H"
+
+            twoPhaseProperties.correct();
 
             #include "UEqn.H"
 
diff --git a/applications/solvers/multiphase/driftFluxFoam/kEpsilon.H b/applications/solvers/multiphase/driftFluxFoam/kEpsilon.H
index 5aaccab8..20d46617 100644
--- a/applications/solvers/multiphase/driftFluxFoam/kEpsilon.H
+++ b/applications/solvers/multiphase/driftFluxFoam/kEpsilon.H
@@ -21,6 +21,8 @@ if (turbulence)
         Cmu*k/sigmak*(g & fvc::grad(rho))/(epsilon + epsilonMin)
     );
 
+    volScalarField muc(twoPhaseProperties.nuModel2().nu()*rho2);
+
     #include "wallFunctions.H"
 
     // Dissipation equation
@@ -75,4 +77,4 @@ if (turbulence)
     #include "wallViscosity.H"
 }
 
-muEff = mut + mul;
+muEff = mut + twoPhaseProperties.mu();
diff --git a/applications/solvers/multiphase/driftFluxFoam/plasticViscosity.H b/applications/solvers/multiphase/driftFluxFoam/plasticViscosity.H
deleted file mode 100644
index 4be4e6ea..00000000
--- a/applications/solvers/multiphase/driftFluxFoam/plasticViscosity.H
+++ /dev/null
@@ -1,21 +0,0 @@
-volScalarField plasticViscosity
-(
-    const dimensionedScalar& plasticViscosityCoeff,
-    const dimensionedScalar& plasticViscosityExponent,
-    const volScalarField& Alpha
-)
-{
-    tmp<volScalarField> tfld
-    (
-         plasticViscosityCoeff*
-         (
-             pow
-             (
-                 10.0,
-                 plasticViscosityExponent*Alpha + SMALL
-             ) - scalar(1)
-         )
-    );
-
-    return tfld();
-}
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/files b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/files
new file mode 100644
index 00000000..01436506
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/files
@@ -0,0 +1,5 @@
+relativeVelocityModel/relativeVelocityModel.C
+simple/simple.C
+general/general.C
+
+LIB = $(FOAM_LIBBIN)/libdriftFluxRelativeVelocityModels
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options
new file mode 100644
index 00000000..badd30f2
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options
@@ -0,0 +1,10 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
+    -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume \
+    -lincompressibleTransportModels
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.C
new file mode 100644
index 00000000..f39aa747
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.C
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "general.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace relativeVelocityModels
+{
+    defineTypeNameAndDebug(general, 0);
+    addToRunTimeSelectionTable(relativeVelocityModel, general, dictionary);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::relativeVelocityModels::general::general
+(
+    const dictionary& dict,
+    const incompressibleTwoPhaseMixture& mixture
+)
+:
+    relativeVelocityModel(dict, mixture),
+    a_(dict.lookup("a")),
+    a1_(dict.lookup("a1")),
+    V0_(dict.lookup("V0")),
+    residualAlpha_(dict.lookup("residualAlpha"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::relativeVelocityModels::general::~general()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volVectorField>
+Foam::relativeVelocityModels::general::Ur() const
+{
+    return
+        V0_
+       *(
+            exp(-a_*max(alphaD_ - residualAlpha_, scalar(0)))
+          - exp(-a1_*max(alphaD_ - residualAlpha_, scalar(0)))
+        )
+       /max(alphaC_, residualAlpha_);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.H b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.H
new file mode 100644
index 00000000..34f5247a
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.H
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::general
+
+Description
+    General relative velocity model
+
+SourceFiles
+    general.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef general_H
+#define general_H
+
+#include "relativeVelocityModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace relativeVelocityModels
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class general Declaration
+\*---------------------------------------------------------------------------*/
+
+class general
+:
+    public relativeVelocityModel
+{
+    // Private data
+
+        //- a coefficient
+        dimensionedScalar a_;
+
+        //- a1 coefficient
+        dimensionedScalar a1_;
+
+        //- Drift velocity
+        dimensionedVector V0_;
+
+        //- Residual phase fraction
+        dimensionedScalar residualAlpha_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("general");
+
+
+    // Constructors
+
+        //- Construct from components
+        general
+        (
+            const dictionary& dict,
+            const incompressibleTwoPhaseMixture& mixture
+        );
+
+
+    //- Destructor
+    ~general();
+
+
+    // Member Functions
+
+        //- Relative velocity
+        virtual tmp<volVectorField> Ur() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace relativeVelocityModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
new file mode 100644
index 00000000..5b0e51a2
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
@@ -0,0 +1,175 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "relativeVelocityModel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(relativeVelocityModel, 0);
+    defineRunTimeSelectionTable(relativeVelocityModel, dictionary);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::relativeVelocityModel::relativeVelocityModel
+(
+    const dictionary& dict,
+    const incompressibleTwoPhaseMixture& mixture
+)
+:
+    mixture_(mixture),
+
+    continuousPhaseName_(dict.lookup("continuousPhase")),
+
+    alphaC_
+    (
+        mixture.phase1Name() == continuousPhaseName_
+      ? mixture.alpha1()
+      : mixture.alpha2()
+    ),
+
+    alphaD_
+    (
+        mixture.phase1Name() == continuousPhaseName_
+      ? mixture.alpha2()
+      : mixture.alpha1()
+    ),
+
+    rhoC_
+    (
+        mixture.phase1Name() == continuousPhaseName_
+      ? mixture.rho1()
+      : mixture.rho2()
+    ),
+
+    rhoD_
+    (
+        mixture.phase1Name() == continuousPhaseName_
+      ? mixture.rho2()
+      : mixture.rho1()
+    ),
+
+    Udm_
+    (
+        IOobject
+        (
+            "Udm",
+            alphaC_.time().timeName(),
+            alphaC_.mesh()
+        ),
+        alphaC_.mesh(),
+        dimensionedVector("Udm", dimVelocity, vector::zero),
+        mixture.U().boundaryField().types()
+    ),
+
+    tau_
+    (
+        IOobject
+        (
+            "Udm",
+            alphaC_.time().timeName(),
+            alphaC_.mesh()
+        ),
+        alphaC_.mesh(),
+        dimensionedSymmTensor
+        (
+            "Udm",
+            sqr(dimVelocity)*dimDensity,
+            symmTensor::zero
+        )
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::relativeVelocityModel> Foam::relativeVelocityModel::New
+(
+    const dictionary& dict,
+    const incompressibleTwoPhaseMixture& mixture
+)
+{
+    word modelType(dict.lookup(typeName));
+
+    Info<< "Selecting relative velocity model " << modelType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(modelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "relativeVelocityModel::New"
+            "("
+                "const dictionary&"
+            ")"
+        )   << "Unknown time scale model type " << modelType
+            << ", constructor not in hash table" << nl << nl
+            << "    Valid time scale model types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << abort(FatalError);
+    }
+
+    return
+        autoPtr<relativeVelocityModel>
+        (
+            cstrIter()
+            (
+                dict.subDict(modelType + "Coeffs"),
+                mixture
+            )
+        );
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::relativeVelocityModel::~relativeVelocityModel()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::relativeVelocityModel::update()
+{
+    tmp<volVectorField> URel(Ur());
+
+    tmp<volScalarField> betaC(alphaC_*rhoC_);
+    tmp<volScalarField> betaD(alphaD_*rhoD_);
+    tmp<volScalarField> rhoM(betaC() + betaD());
+
+    tmp<volVectorField> Udm = URel()*betaC()/rhoM;
+    tmp<volVectorField> Ucm = Udm() - URel;
+
+    Udm_ = Udm();
+    tau_ = betaD*sqr(Udm) + betaC*sqr(Ucm);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H
new file mode 100644
index 00000000..73277bc3
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H
@@ -0,0 +1,158 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::relativeVelocityModel
+
+Description
+
+SourceFiles
+    relativeVelocityModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef relativeVelocityModel_H
+#define relativeVelocityModel_H
+
+#include "fvCFD.H"
+#include "dictionary.H"
+#include "incompressibleTwoPhaseMixture.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class relativeVelocityModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class relativeVelocityModel
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        relativeVelocityModel(const relativeVelocityModel&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const relativeVelocityModel&);
+
+protected:
+
+    // Protected data
+
+        //- Mixture properties
+        const incompressibleTwoPhaseMixture& mixture_;
+
+        //- Name of the continuous phase
+        const word continuousPhaseName_;
+
+        //- Continuous phase fraction
+        const volScalarField& alphaC_;
+
+        //- Dispersed phase fraction
+        const volScalarField& alphaD_;
+
+        //- Continuous density
+        const dimensionedScalar& rhoC_;
+
+        //- Dispersed density
+        const dimensionedScalar& rhoD_;
+
+        //- Dispersed diffusion velocity
+        volVectorField Udm_;
+
+        //- Stress
+        volSymmTensorField tau_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("relativeVelocityModel");
+
+    //- Declare runtime constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        relativeVelocityModel,
+        dictionary,
+        (const dictionary& dict, const incompressibleTwoPhaseMixture& mixture),
+        (dict, mixture)
+    );
+
+
+    // Constructors
+
+        //- Construct from components
+        relativeVelocityModel
+        (
+            const dictionary& dict,
+            const incompressibleTwoPhaseMixture& mixture
+        );
+
+
+    // Selector
+    static autoPtr<relativeVelocityModel> New
+    (
+        const dictionary& dict,
+        const incompressibleTwoPhaseMixture& mixture
+    );
+
+
+    //- Destructor
+    virtual ~relativeVelocityModel();
+
+
+    // Member Functions
+
+        //- Calculate the relative velocity of the dispersed phase
+        virtual tmp<volVectorField> Ur() const = 0;
+
+        //- Return the diffusion velocity of the dispersed phase
+        const volVectorField& Udm() const
+        {
+            return Udm_;
+        }
+
+        //- Return the stress tensor due to the phase transport
+        const volSymmTensorField& tau() const
+        {
+            return tau_;
+        }
+
+        //- Update the stored diffusion velocity and stress
+        void update();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/simple/simple.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/simple/simple.C
new file mode 100644
index 00000000..a8e99b25
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/simple/simple.C
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "simple.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace relativeVelocityModels
+{
+    defineTypeNameAndDebug(simple, 0);
+    addToRunTimeSelectionTable(relativeVelocityModel, simple, dictionary);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::relativeVelocityModels::simple::simple
+(
+    const dictionary& dict,
+    const incompressibleTwoPhaseMixture& mixture
+)
+:
+    relativeVelocityModel(dict, mixture),
+    a_(dict.lookup("a")),
+    V0_(dict.lookup("V0")),
+    residualAlpha_(dict.lookup("residualAlpha"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::relativeVelocityModels::simple::~simple()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volVectorField>
+Foam::relativeVelocityModels::simple::Ur() const
+{
+    return
+        V0_
+       *pow(scalar(10), -a_*max(alphaD_, scalar(0)))
+       /max(alphaC_, residualAlpha_);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/simple/simple.H b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/simple/simple.H
new file mode 100644
index 00000000..e94f854e
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/simple/simple.H
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::simple
+
+Description
+    Simple relative velocity model
+
+SourceFiles
+    simple.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef simple_H
+#define simple_H
+
+#include "relativeVelocityModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace relativeVelocityModels
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class simple Declaration
+\*---------------------------------------------------------------------------*/
+
+class simple
+:
+    public relativeVelocityModel
+{
+    // Private data
+
+        //- a coefficient
+        dimensionedScalar a_;
+
+        //- Drift velocity
+        dimensionedVector V0_;
+
+        //- Residual phase fraction
+        dimensionedScalar residualAlpha_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("simple");
+
+
+    // Constructors
+
+        //- Construct from components
+        simple
+        (
+            const dictionary& dict,
+            const incompressibleTwoPhaseMixture& mixture
+        );
+
+
+    //- Destructor
+    ~simple();
+
+
+    // Member Functions
+
+        //- Relative velocity
+        virtual tmp<volVectorField> Ur() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace relativeVelocityModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/driftFluxFoam/viscosityModels/BinghamPlastic/BinghamPlastic.C b/applications/solvers/multiphase/driftFluxFoam/viscosityModels/BinghamPlastic/BinghamPlastic.C
new file mode 100644
index 00000000..f75355f8
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/viscosityModels/BinghamPlastic/BinghamPlastic.C
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "BinghamPlastic.H"
+#include "addToRunTimeSelectionTable.H"
+#include "surfaceFields.H"
+#include "fvc.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace viscosityModels
+{
+    defineTypeNameAndDebug(BinghamPlastic, 0);
+
+    addToRunTimeSelectionTable
+    (
+        viscosityModel,
+        BinghamPlastic,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField>
+Foam::viscosityModels::BinghamPlastic::correctionNu
+(
+    const dimensionedScalar& rhoc,
+    const dimensionedScalar& rhop,
+    const volScalarField& nuc
+) const
+{
+    volScalarField
+        tauy
+        (
+            yieldStressCoeff_
+           *(
+                pow
+                (
+                    scalar(10),
+                    yieldStressExponent_
+                   *(max(alpha_, scalar(0)) + yieldStressOffset_)
+                )
+              - pow
+                (
+                    scalar(10),
+                    yieldStressExponent_*yieldStressOffset_
+                )
+            )
+        );
+
+    volScalarField
+        nup
+        (
+            plastic::correctionNu(rhoc, rhop, nuc)
+        );
+
+    dimensionedScalar tauySmall("tauySmall", tauy.dimensions(), SMALL);
+
+    return
+        tauy
+       /(
+            mag(fvc::grad(U_))
+          + 1.0e-4*(tauy + tauySmall)/(nup + (rhoc/rhop)*nuc)
+        )
+      + nup;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::viscosityModels::BinghamPlastic::BinghamPlastic
+(
+    const word& name,
+    const dictionary& viscosityProperties,
+    const volVectorField& U,
+    const surfaceScalarField& phi
+)
+:
+    plastic(name, viscosityProperties, U, phi, typeName),
+    yieldStressCoeff_(plasticCoeffs_.lookup("yieldStressCoeff")),
+    yieldStressExponent_(plasticCoeffs_.lookup("yieldStressExponent")),
+    yieldStressOffset_(plasticCoeffs_.lookup("yieldStressOffset")),
+    U_(U)
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+bool Foam::viscosityModels::BinghamPlastic::read
+(
+    const dictionary& viscosityProperties
+)
+{
+    plastic::read(viscosityProperties);
+
+    plasticCoeffs_.lookup("yieldStressCoeff") >> yieldStressCoeff_;
+    plasticCoeffs_.lookup("yieldStressExponent") >> yieldStressExponent_;
+    plasticCoeffs_.lookup("yieldStressOffset") >> yieldStressOffset_;
+
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/driftFluxFoam/viscosityModels/BinghamPlastic/BinghamPlastic.H b/applications/solvers/multiphase/driftFluxFoam/viscosityModels/BinghamPlastic/BinghamPlastic.H
new file mode 100644
index 00000000..829f42b7
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/viscosityModels/BinghamPlastic/BinghamPlastic.H
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::viscosityModels::BinghamPlastic
+
+Description
+     Viscosity correction model for Bingham plastics.
+
+SourceFiles
+    BinghamPlastic.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef BinghamPlastic_H
+#define BinghamPlastic_H
+
+#include "plastic.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace viscosityModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class BinghamPlastic Declaration
+\*---------------------------------------------------------------------------*/
+
+class BinghamPlastic
+:
+    public plastic
+{
+protected:
+
+    // Protected data
+
+        //- Yield stress coefficient
+        dimensionedScalar yieldStressCoeff_;
+
+        //- Yield stress exponent
+        dimensionedScalar yieldStressExponent_;
+
+        //- Yield stress offset
+        dimensionedScalar yieldStressOffset_;
+
+        //- Velocity
+        const volVectorField& U_;
+
+
+    // Protected Member Functions
+
+        //- Calculate and return the laminar viscosity correction
+        virtual tmp<volScalarField> correctionNu
+        (
+            const dimensionedScalar& rhoc,
+            const dimensionedScalar& rhop,
+            const volScalarField& nuc
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("BinghamPlastic");
+
+
+    // Constructors
+
+        //- Construct from components
+        BinghamPlastic
+        (
+            const word& name,
+            const dictionary& viscosityProperties,
+            const volVectorField& U,
+            const surfaceScalarField& phi
+        );
+
+
+    //- Destructor
+    ~BinghamPlastic()
+    {}
+
+
+    // Member Functions
+
+        //- Read transportProperties dictionary
+        bool read(const dictionary& viscosityProperties);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace viscosityModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/driftFluxFoam/viscosityModels/Make/files b/applications/solvers/multiphase/driftFluxFoam/viscosityModels/Make/files
new file mode 100644
index 00000000..db148b46
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/viscosityModels/Make/files
@@ -0,0 +1,4 @@
+plastic/plastic.C
+BinghamPlastic/BinghamPlastic.C
+
+LIB = $(FOAM_LIBBIN)/libdriftFluxTransportModels
diff --git a/applications/solvers/multiphase/driftFluxFoam/viscosityModels/Make/options b/applications/solvers/multiphase/driftFluxFoam/viscosityModels/Make/options
new file mode 100644
index 00000000..6c72f3a6
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/viscosityModels/Make/options
@@ -0,0 +1,10 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
+    -I$(LIB_SRC)/transportModels/incompressible/lnInclude
+
+LIB_LIBS = \
+    -ltwoPhaseMixture \
+    -lincompressibleTransportModels \
+    -lfiniteVolume
diff --git a/applications/solvers/multiphase/driftFluxFoam/viscosityModels/plastic/plastic.C b/applications/solvers/multiphase/driftFluxFoam/viscosityModels/plastic/plastic.C
new file mode 100644
index 00000000..12b89e4c
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/viscosityModels/plastic/plastic.C
@@ -0,0 +1,200 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "plastic.H"
+#include "addToRunTimeSelectionTable.H"
+#include "surfaceFields.H"
+#include "incompressibleTwoPhaseMixture.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace viscosityModels
+{
+    defineTypeNameAndDebug(plastic, 0);
+
+    addToRunTimeSelectionTable
+    (
+        viscosityModel,
+        plastic,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField>
+Foam::viscosityModels::plastic::calcNu() const
+{
+    const incompressibleTwoPhaseMixture& twoPhaseProperties =
+        alpha_.mesh().lookupObject<incompressibleTwoPhaseMixture>
+        (
+            "transportProperties"
+        );
+
+    bool isThisIsPhase1(&twoPhaseProperties.nuModel1() == this);
+
+    dimensionedScalar
+        rhoc
+        (
+            isThisIsPhase1
+          ? twoPhaseProperties.rho2()
+          : twoPhaseProperties.rho1()
+        );
+
+    dimensionedScalar
+        rhop
+        (
+            isThisIsPhase1
+          ? twoPhaseProperties.rho1()
+          : twoPhaseProperties.rho2()
+        );
+
+    volScalarField
+        nuc
+        (
+            (
+                isThisIsPhase1
+              ? twoPhaseProperties.nuModel2()
+              : twoPhaseProperties.nuModel1()
+            ).nu()
+        );
+
+    volScalarField
+        nup
+        (
+            correctionNu(rhoc, rhop, nuc)
+        );
+
+    return
+        max
+        (
+            nuMin_,
+            min
+            (
+                nuMax_,
+                (
+                    nup + (rhoc/rhop)*nuc*alpha_
+                )
+            )
+        )
+       /max(alpha_, SMALL);
+}
+
+
+Foam::tmp<Foam::volScalarField>
+Foam::viscosityModels::plastic::correctionNu
+(
+    const dimensionedScalar& rhoc,
+    const dimensionedScalar& rhop,
+    const volScalarField& nuc
+) const
+{
+    return
+        plasticViscosityCoeff_
+       *(
+            pow
+            (
+                scalar(10),
+                plasticViscosityExponent_*alpha_
+            ) - scalar(1)
+        );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::viscosityModels::plastic::plastic
+(
+    const word& name,
+    const dictionary& viscosityProperties,
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const word modelName
+)
+:
+    viscosityModel(name, viscosityProperties, U, phi),
+    plasticCoeffs_(viscosityProperties.subDict(modelName + "Coeffs")),
+    plasticViscosityCoeff_
+    (
+        plasticCoeffs_.lookup("plasticViscosityCoeff")
+    ),
+    plasticViscosityExponent_
+    (
+        plasticCoeffs_.lookup("plasticViscosityExponent")
+    ),
+    nuMin_(plasticCoeffs_.lookup("nuMin")),
+    nuMax_(plasticCoeffs_.lookup("nuMax")),
+    alpha_
+    (
+        U.mesh().lookupObject<volScalarField>
+        (
+            IOobject::groupName
+            (
+                viscosityProperties.lookupOrDefault<word>("alpha", "alpha"),
+                viscosityProperties.dictName()
+            )
+        )
+    ),
+    nu_
+    (
+        IOobject
+        (
+            name,
+            U_.time().timeName(),
+            U_.db(),
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        U_.mesh(),
+        dimensionedScalar("nu", dimViscosity, 0)
+    )
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+bool Foam::viscosityModels::plastic::read
+(
+    const dictionary& viscosityProperties
+)
+{
+    viscosityModel::read(viscosityProperties);
+
+    plasticCoeffs_ = viscosityProperties.subDict(typeName + "Coeffs");
+
+    plasticCoeffs_.lookup("k") >> plasticViscosityCoeff_;
+    plasticCoeffs_.lookup("n") >> plasticViscosityExponent_;
+    plasticCoeffs_.lookup("nuMin") >> nuMin_;
+    plasticCoeffs_.lookup("nuMax") >> nuMax_;
+
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/driftFluxFoam/viscosityModels/plastic/plastic.H b/applications/solvers/multiphase/driftFluxFoam/viscosityModels/plastic/plastic.H
new file mode 100644
index 00000000..3ac9ae29
--- /dev/null
+++ b/applications/solvers/multiphase/driftFluxFoam/viscosityModels/plastic/plastic.H
@@ -0,0 +1,158 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::viscosityModels::plastic
+
+Description
+     Viscosity correction model for a generic power-law plastic.
+
+SourceFiles
+    plastic.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef plastic_H
+#define plastic_H
+
+#include "viscosityModel.H"
+#include "dimensionedScalar.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class incompressibleTwoPhaseMixture;
+
+namespace viscosityModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class plastic Declaration
+\*---------------------------------------------------------------------------*/
+
+class plastic
+:
+    public viscosityModel
+{
+protected:
+
+    // Protected data
+
+        //- Dictionary
+        dictionary plasticCoeffs_;
+
+        //- Plastic viscosity coefficient
+        dimensionedScalar plasticViscosityCoeff_;
+
+        //- Plastic viscosity exponent
+        dimensionedScalar plasticViscosityExponent_;
+
+        //- Minimum viscosity
+        dimensionedScalar nuMin_;
+
+        //- Maximum viscosity
+        dimensionedScalar nuMax_;
+
+        //- Plastic phase fraction
+        const volScalarField& alpha_;
+
+        //- Viscosity
+        volScalarField nu_;
+
+
+    // Protected Member Functions
+
+        //- Calculate and return the laminar viscosity
+        virtual tmp<volScalarField> calcNu() const;
+
+        //- Calculate and return the laminar viscosity correction
+        virtual tmp<volScalarField> correctionNu
+        (
+            const dimensionedScalar& rhoc,
+            const dimensionedScalar& rhop,
+            const volScalarField& nuc
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("plastic");
+
+
+    // Constructors
+
+        //- Construct from components
+        plastic
+        (
+            const word& name,
+            const dictionary& viscosityProperties,
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const word modelName=typeName
+        );
+
+
+    //- Destructor
+    ~plastic()
+    {}
+
+
+    // Member Functions
+
+        //- Return the laminar viscosity
+        tmp<volScalarField> nu() const
+        {
+            return nu_;
+        }
+
+        //- Return the laminar viscosity for patch
+        tmp<scalarField> nu(const label patchi) const
+        {
+            return nu_.boundaryField()[patchi];
+        }
+
+        //- Correct the laminar viscosity
+        void correct()
+        {
+            nu_ = calcNu();
+        }
+
+        //- Read transportProperties dictionary
+        bool read(const dictionary& viscosityProperties);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace viscosityModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/driftFluxFoam/wallFunctions.H b/applications/solvers/multiphase/driftFluxFoam/wallFunctions.H
index 149d787c..b9ff8481 100644
--- a/applications/solvers/multiphase/driftFluxFoam/wallFunctions.H
+++ b/applications/solvers/multiphase/driftFluxFoam/wallFunctions.H
@@ -4,7 +4,6 @@
     const scalar Cmu25 = ::pow(Cmu.value(), 0.25);
     const scalar Cmu75 = ::pow(Cmu.value(), 0.75);
     const scalar kappa_ = kappa.value();
-    const scalar muc_ = muc.value();
 
     const fvPatchList& patches = mesh.boundary();
 
@@ -34,6 +33,7 @@
         if (isA<wallFvPatch>(curPatch))
         {
             const scalarField& mutw = mut.boundaryField()[patchi];
+            const scalarField& mucw = muc.boundaryField()[patchi];
 
             scalarField magFaceGradU
             (
@@ -55,7 +55,7 @@
                    /(kappa_*y[patchi][facei]);
 
                 G[faceCelli] +=
-                    (mutw[facei] + muc_)
+                    (mutw[facei] + mucw[facei])
                    *magFaceGradU[facei]
                    *Cmu25*::sqrt(k[faceCelli])
                    /(kappa_*y[patchi][facei]);
diff --git a/applications/solvers/multiphase/driftFluxFoam/wallViscosity.H b/applications/solvers/multiphase/driftFluxFoam/wallViscosity.H
index ac87a026..2b54f6c2 100644
--- a/applications/solvers/multiphase/driftFluxFoam/wallViscosity.H
+++ b/applications/solvers/multiphase/driftFluxFoam/wallViscosity.H
@@ -2,8 +2,6 @@
     const scalar Cmu25 = ::pow(Cmu.value(), 0.25);
     const scalar kappa_ = kappa.value();
     const scalar E_ = E.value();
-    const scalar muc_ = muc.value();
-    const scalar nuc_ = muc_/rho2.value();
 
     const fvPatchList& patches = mesh.boundary();
 
@@ -14,6 +12,7 @@
         if (isA<wallFvPatch>(curPatch))
         {
             scalarField& mutw = mut.boundaryField()[patchi];
+            const scalarField& mucw = muc.boundaryField()[patchi];
 
             forAll(curPatch, facei)
             {
@@ -21,12 +20,12 @@
 
                 scalar yPlus =
                     Cmu25*y[patchi][facei]*::sqrt(k[faceCelli])
-                   /nuc_;
+                   /(mucw[facei]/rho2.value());
 
                 if (yPlus > 11.6)
                 {
                     mutw[facei] =
-                        muc_*(yPlus*kappa_/::log(E_*yPlus) - 1);
+                        mucw[facei]*(yPlus*kappa_/::log(E_*yPlus) - 1);
                 }
                 else
                 {
diff --git a/applications/solvers/multiphase/driftFluxFoam/yieldStress.H b/applications/solvers/multiphase/driftFluxFoam/yieldStress.H
deleted file mode 100644
index 8d3fd8ee..00000000
--- a/applications/solvers/multiphase/driftFluxFoam/yieldStress.H
+++ /dev/null
@@ -1,27 +0,0 @@
-volScalarField yieldStress
-(
-    const dimensionedScalar& yieldStressCoeff,
-    const dimensionedScalar& yieldStressExponent,
-    const dimensionedScalar& yieldStressOffset,
-    const volScalarField& alpha1
-)
-{
-    tmp<volScalarField> tfld
-    (
-        yieldStressCoeff*
-        (
-            pow
-            (
-                10.0,
-                yieldStressExponent*(max(alpha1, scalar(0)) + yieldStressOffset)
-            )
-          - pow
-            (
-                10.0,
-                yieldStressExponent*yieldStressOffset
-            )
-        )
-    );
-
-    return tfld();
-}
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
index e32d6a6c..aedf27e8 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,6 +28,13 @@ License
 #include "surfaceFields.H"
 #include "fvc.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(incompressibleTwoPhaseMixture, 0);
+}
+
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H
index 5c4920e1..6928f50b 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,6 +80,9 @@ protected:
 
 public:
 
+    TypeName("incompressibleTwoPhaseMixture");
+
+
     // Constructors
 
         //- Construct from components
@@ -121,6 +124,12 @@ public:
             return rho2_;
         };
 
+        //- Return const-access to the mixture velocity
+        const volVectorField& U() const
+        {
+            return U_;
+        }
+
         //- Return the dynamic laminar viscosity
         tmp<volScalarField> mu() const;
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U
index 0e549348..a7ba7813 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha1 b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha.sludge
similarity index 93%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha1
rename to tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha.sludge
index 650cc6d1..81654a23 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha1
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha.sludge
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.sludge;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/epsilon b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/epsilon
index c03c54f5..de83baf1 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/epsilon
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/k b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/k
index c4e854d3..41fcaaaa 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/k
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/p_rgh b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/p_rgh
index 81c72d7f..e76e8ae3 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/p_rgh
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/RASProperties b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/RASProperties
index a4937b50..d964d3c8 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/RASProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/RASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/g b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/g
index 0cc222ca..e5a2d667 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/g
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/blockMeshDict b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/blockMeshDict
index 5e07da70..335bddb4 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/boundary b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/boundary
index 18f019f6..64070d8b 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/boundary
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties
index e2079db0..a1a64a8d 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -15,41 +15,45 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-muc             muc [ 1 -1 -1 0 0 0 0 ] 0.00178;
+phases          (sludge water);
 
-plasticViscosityCoeff plasticViscosityCoeff [ 1 -1 -1 0 0 0 0 ] 0.00023143;
-
-plasticViscosityExponent plasticViscosityExponent [ 0 0 0 0 0 0 0 ] 179.26;
-
-BinghamPlastic  on;
-
-yieldStressCoeff yieldStressCoeff [ 1 -1 -2 0 0 0 0 ] 0.00042189;
-
-yieldStressExponent yieldStressExponent [ 0 0 0 0 0 0 0 ] 1050.8;
-
-yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0;
-
-muMax           muMax [ 1 -1 -1 0 0 0 0 ] 10.0;
-
-rho1            rho1 [ 1 -3 0 0 0 0 0 ] 1996;
-rho2            rho2 [ 1 -3 0 0 0 0 0 ] 996;
-
-VdjModel        simple;
-
-simpleCoeffs
+sludge
 {
-    V0              V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.002198 0 );
-    a               a [ 0 0 0 0 0 0 0 ] 285.84;
-    a1              a1 [ 0 0 0 0 0 0 0 ] 0;
-    alphaMin        alphaMin [ 0 0 0 0 0 0 0 ] 0;
+    transportModel  BinghamPlastic;
+
+    "(plastic|BinghamPlastic)Coeffs"
+    {
+        plasticViscosityCoeff plasticViscosityCoeff [ 0 2 -1 0 0 0 0 ] 1.1595e-07;
+        plasticViscosityExponent plasticViscosityExponent [ 0 0 0 0 0 0 0 ] 179.26;
+
+        yieldStressCoeff yieldStressCoeff [ 0 2 -2 0 0 0 0 ] 2.1137e-07;
+        yieldStressExponent yieldStressExponent [ 0 0 0 0 0 0 0 ] 1050.8;
+        yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0;
+
+        nuMin       nuMin [ 0 2 -1 0 0 0 0 ] 1e-10;
+        nuMax       nuMax [ 0 2 -1 0 0 0 0 ] 5e-3;
+    }
+
+    rho         rho [ 1 -3 0 0 0 0 0 ] 1996;
 }
 
-generalCoeffs
+water
 {
-    V0              V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.0018 0 );
-    a               a [ 0 0 0 0 0 0 0 ] 1e-05;
+    transportModel  Newtonian;
+
+    nu      nu [ 0 2 -1 0 0 0 0 ] 1.7871e-06;
+    rho     rho [ 1 -3 0 0 0 0 0 ] 996;
+}
+
+relativeVelocityModel simple;
+
+"(simple|general)Coeffs"
+{
+    continuousPhase water;
+    V0              V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.002198 0 );
+    a               a [ 0 0 0 0 0 0 0 ] 285.84;
     a1              a1 [ 0 0 0 0 0 0 0 ] 0.1;
-    alphaMin        alphaMin [ 0 0 0 0 0 0 0 ] 2e-05;
+    residualAlpha   residualAlpha [ 0 0 0 0 0 0 0 ] 0;
 }
 
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict
index 67e02247..2448b41f 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
index 98e6fa16..37cb7ec6 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -30,9 +30,9 @@ divSchemes
     default             none;
 
     div(rhoPhi,U)       Gauss linearUpwind grad(U);
-    div(phiVdj,Vdj)     Gauss linear;
-    div(phi,alpha)      Gauss vanLeer;
-    div(phirb,alpha)    Gauss linear;
+    div(phiUkm,Ukm)     Gauss linear;
+    "div\(phi,alpha.*\)" Gauss vanLeer;
+    "div\(phirb,alpha.*\)" Gauss linear;
     div(rhoPhi,k)       Gauss limitedLinear 1;
     div(rhoPhi,epsilon) Gauss limitedLinear 1;
 
@@ -58,7 +58,7 @@ fluxRequired
 {
     default         no;
     p_rgh;
-    alpha1;
+    "alpha.*";
 }
 
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
index b78a4821..643f0d98 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    "alpha1.*"
+    "alpha.*"
     {
         nAlphaCorr      2;
         nAlphaSubCycles 1;
@@ -33,7 +33,7 @@ solvers
         minIter         1;
     }
 
-    alpha1Diffusion
+    "alpha.*Diffusion"
     {
         solver          PCG;
         preconditioner  DIC;
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U
index 500a0fbe..b13f9a2d 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha1 b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha.sludge
similarity index 91%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha1
rename to tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha.sludge
index 22f0efce..25e16441 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha1
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha.sludge
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.sludge;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/epsilon b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/epsilon
index d2aa19f5..60c49b3e 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/epsilon
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/k b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/k
index d8a36785..4aae91ee 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/k
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/p_rgh b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/p_rgh
index dd48a876..7b7a6e04 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/p_rgh
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/RASProperties b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/RASProperties
index a4937b50..d964d3c8 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/RASProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/RASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/g b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/g
index d182180d..099c2ee8 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
index a9386849..2b215888 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties
index e2079db0..a1a64a8d 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -15,41 +15,45 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-muc             muc [ 1 -1 -1 0 0 0 0 ] 0.00178;
+phases          (sludge water);
 
-plasticViscosityCoeff plasticViscosityCoeff [ 1 -1 -1 0 0 0 0 ] 0.00023143;
-
-plasticViscosityExponent plasticViscosityExponent [ 0 0 0 0 0 0 0 ] 179.26;
-
-BinghamPlastic  on;
-
-yieldStressCoeff yieldStressCoeff [ 1 -1 -2 0 0 0 0 ] 0.00042189;
-
-yieldStressExponent yieldStressExponent [ 0 0 0 0 0 0 0 ] 1050.8;
-
-yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0;
-
-muMax           muMax [ 1 -1 -1 0 0 0 0 ] 10.0;
-
-rho1            rho1 [ 1 -3 0 0 0 0 0 ] 1996;
-rho2            rho2 [ 1 -3 0 0 0 0 0 ] 996;
-
-VdjModel        simple;
-
-simpleCoeffs
+sludge
 {
-    V0              V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.002198 0 );
-    a               a [ 0 0 0 0 0 0 0 ] 285.84;
-    a1              a1 [ 0 0 0 0 0 0 0 ] 0;
-    alphaMin        alphaMin [ 0 0 0 0 0 0 0 ] 0;
+    transportModel  BinghamPlastic;
+
+    "(plastic|BinghamPlastic)Coeffs"
+    {
+        plasticViscosityCoeff plasticViscosityCoeff [ 0 2 -1 0 0 0 0 ] 1.1595e-07;
+        plasticViscosityExponent plasticViscosityExponent [ 0 0 0 0 0 0 0 ] 179.26;
+
+        yieldStressCoeff yieldStressCoeff [ 0 2 -2 0 0 0 0 ] 2.1137e-07;
+        yieldStressExponent yieldStressExponent [ 0 0 0 0 0 0 0 ] 1050.8;
+        yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0;
+
+        nuMin       nuMin [ 0 2 -1 0 0 0 0 ] 1e-10;
+        nuMax       nuMax [ 0 2 -1 0 0 0 0 ] 5e-3;
+    }
+
+    rho         rho [ 1 -3 0 0 0 0 0 ] 1996;
 }
 
-generalCoeffs
+water
 {
-    V0              V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.0018 0 );
-    a               a [ 0 0 0 0 0 0 0 ] 1e-05;
+    transportModel  Newtonian;
+
+    nu      nu [ 0 2 -1 0 0 0 0 ] 1.7871e-06;
+    rho     rho [ 1 -3 0 0 0 0 0 ] 996;
+}
+
+relativeVelocityModel simple;
+
+"(simple|general)Coeffs"
+{
+    continuousPhase water;
+    V0              V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.002198 0 );
+    a               a [ 0 0 0 0 0 0 0 ] 285.84;
     a1              a1 [ 0 0 0 0 0 0 0 ] 0.1;
-    alphaMin        alphaMin [ 0 0 0 0 0 0 0 ] 2e-05;
+    residualAlpha   residualAlpha [ 0 0 0 0 0 0 0 ] 0;
 }
 
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict
index 5f9bee13..e443cf69 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvOptions b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvOptions
index ee6ce81f..6cc02ab9 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvOptions
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
index 98e6fa16..37cb7ec6 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -30,9 +30,9 @@ divSchemes
     default             none;
 
     div(rhoPhi,U)       Gauss linearUpwind grad(U);
-    div(phiVdj,Vdj)     Gauss linear;
-    div(phi,alpha)      Gauss vanLeer;
-    div(phirb,alpha)    Gauss linear;
+    div(phiUkm,Ukm)     Gauss linear;
+    "div\(phi,alpha.*\)" Gauss vanLeer;
+    "div\(phirb,alpha.*\)" Gauss linear;
     div(rhoPhi,k)       Gauss limitedLinear 1;
     div(rhoPhi,epsilon) Gauss limitedLinear 1;
 
@@ -58,7 +58,7 @@ fluxRequired
 {
     default         no;
     p_rgh;
-    alpha1;
+    "alpha.*";
 }
 
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
index 3fa09bb4..be226094 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    "alpha1.*"
+    "alpha.*"
     {
         nAlphaCorr      2;
         nAlphaSubCycles 1;
@@ -33,7 +33,7 @@ solvers
         minIter         1;
     }
 
-    alpha1Diffusion
+    "alpha.*Diffusion"
     {
         solver          PCG;
         preconditioner  DIC;
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/setFieldsDict
index c5884201..12179b37 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/topoSetDict
index bf749449..8aa46629 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
index da99a43d..28301bfe 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha1 b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha.sludge
similarity index 95%
rename from tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha1
rename to tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha.sludge
index 1a3bd64e..516eb6c3 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha1
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha.sludge
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.sludge;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/epsilon b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/epsilon
index 5d284b36..880cb3a8 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/epsilon
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/k b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/k
index 60e8e6d3..ae855524 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/k
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/p_rgh b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/p_rgh
index 0e6a2c64..9adc03eb 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/p_rgh
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/RASProperties b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/RASProperties
index a4937b50..d964d3c8 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/RASProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/RASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/g b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/g
index e0ac2653..07c16826 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/g
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/boundary b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/boundary
index 5ccd3d50..86b8aaff 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties
index 8c92706e..40b9765c 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -15,41 +15,45 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-muc             muc [ 1 -1 -1 0 0 0 0 ] 0.00178;
+phases          (sludge water);
 
-plasticViscosityCoeff plasticViscosityCoeff [ 1 -1 -1 0 0 0 0 ] 0.00023143;
-
-plasticViscosityExponent plasticViscosityExponent [ 0 0 0 0 0 0 0 ] 0.17926;
-
-BinghamPlastic  on;
-
-yieldStressCoeff yieldStressCoeff [ 1 -1 -2 0 0 0 0 ] 5.5469e-07;
-
-yieldStressExponent yieldStressExponent [ 0 0 0 0 0 0 0 ] 95.25;
-
-yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0;
-
-muMax           muMax [ 1 -1 -1 0 0 0 0 ] 10.0;
-
-rho1            rho1 [ 1 -3 0 0 0 0 0 ] 1042;
-rho2            rho2 [ 1 -3 0 0 0 0 0 ] 1000;
-
-VdjModel        simple;
-
-simpleCoeffs
+sludge
 {
-    V0              V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.002198 0 );
-    a               a [ 0 0 0 0 0 0 0 ] 8.84;
-    a1              a1 [ 0 0 0 0 0 0 0 ] 0;
-    alphaMin        alphaMin [ 0 0 0 0 0 0 0 ] 0;
+    transportModel  BinghamPlastic;
+
+    "(plastic|BinghamPlastic)Coeffs"
+    {
+        plasticViscosityCoeff plasticViscosityCoeff [ 0 2 -1 0 0 0 0 ] 2.2210e-07;
+        plasticViscosityExponent plasticViscosityExponent [ 0 0 0 0 0 0 0 ] 0.17926;
+
+        yieldStressCoeff yieldStressCoeff [ 0 2 -2 0 0 0 0 ] 5.3233e-10;
+        yieldStressExponent yieldStressExponent [ 0 0 0 0 0 0 0 ] 95.25;
+        yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0;
+
+        nuMin       nuMin [ 0 2 -1 0 0 0 0 ] 1e-10;
+        nuMax       nuMax [ 0 2 -1 0 0 0 0 ] 5e-3;
+    }
+
+    rho         rho [ 1 -3 0 0 0 0 0 ] 1042;
 }
 
-generalCoeffs
+water
 {
-    V0              V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.0018 0 );
-    a               a [ 0 0 0 0 0 0 0 ] 1e-05;
+    transportModel  Newtonian;
+
+    nu      nu [ 0 2 -1 0 0 0 0 ] 1.78e-06;
+    rho     rho [ 1 -3 0 0 0 0 0 ] 1000;
+}
+
+relativeVelocityModel simple;
+
+"(simple|general)Coeffs"
+{
+    continuousPhase water;
+    V0              V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.002198 0 );
+    a               a [ 0 0 0 0 0 0 0 ] 8.84;
     a1              a1 [ 0 0 0 0 0 0 0 ] 0.1;
-    alphaMin        alphaMin [ 0 0 0 0 0 0 0 ] 2e-05;
+    residualAlpha   residualAlpha [ 0 0 0 0 0 0 0 ] 0;
 }
 
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
index dd41af85..af8abb2f 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
index 8809a091..22611d4f 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -30,9 +30,9 @@ divSchemes
     default         none;
 
     div(rhoPhi,U)       Gauss linearUpwind grad(U);
-    div(phiVdj,Vdj)     Gauss linear;
-    div(phi,alpha)      Gauss vanLeer;
-    div(phirb,alpha)    Gauss linear;
+    div(phiUkm,Ukm)     Gauss linear;
+    "div\(phi,alpha.*\)" Gauss vanLeer;
+    "div\(phirb,alpha.*\)" Gauss linear;
     div(rhoPhi,k)       Gauss limitedLinear 1;
     div(rhoPhi,epsilon) Gauss limitedLinear 1;
 
@@ -58,7 +58,7 @@ fluxRequired
 {
     default         no;
     p_rgh;
-    alpha1;
+    "alpha.*";
 }
 
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
index f6f1b18e..163008fd 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    "alpha1.*"
+    "alpha.*"
     {
         nAlphaCorr      2;
         nAlphaSubCycles 1;
@@ -33,7 +33,7 @@ solvers
         minIter         1;
     }
 
-    alpha1Diffusion
+    "alpha.*Diffusion"
     {
         solver          PCG;
         preconditioner  DIC;

From 1f2a3fe7c66b88377b5abd14bac490fe8074426a Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 3 Mar 2014 11:08:30 +0000
Subject: [PATCH 12/13] Removed noDrag and noHeatTransfer models

---
 .../interfacialModels/Make/files              |  2 -
 .../dragModels/noDrag/noDrag.C                | 91 -----------------
 .../dragModels/noDrag/noDrag.H                | 97 -------------------
 .../noHeatTransfer/noHeatTransfer.C           | 87 -----------------
 .../noHeatTransfer/noHeatTransfer.H           | 93 ------------------
 5 files changed, 370 deletions(-)
 delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C
 delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H
 delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.C
 delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.H

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files
index 4457f8ea..9a0afbd7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files
@@ -1,6 +1,5 @@
 dragModels/dragModel/dragModel.C
 dragModels/dragModel/newDragModel.C
-dragModels/noDrag/noDrag.C
 dragModels/segregated/segregated.C
 dragModels/Ergun/Ergun.C
 dragModels/Gibilaro/Gibilaro.C
@@ -25,7 +24,6 @@ liftModels/TomiyamaLift/TomiyamaLift.C
 
 heatTransferModels/heatTransferModel/heatTransferModel.C
 heatTransferModels/heatTransferModel/newHeatTransferModel.C
-heatTransferModels/noHeatTransfer/noHeatTransfer.C
 heatTransferModels/RanzMarshall/RanzMarshall.C
 
 virtualMassModels/virtualMassModel/virtualMassModel.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C
deleted file mode 100644
index d955c9e7..00000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C
+++ /dev/null
@@ -1,91 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "noDrag.H"
-#include "phasePair.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace dragModels
-{
-    defineTypeNameAndDebug(noDrag, 0);
-    addToRunTimeSelectionTable(dragModel, noDrag, dictionary);
-}
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::dragModels::noDrag::noDrag
-(
-    const dictionary& dict,
-    const phasePair& pair,
-    const bool registerObject
-)
-:
-    dragModel(pair, registerObject)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::dragModels::noDrag::~noDrag()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::volScalarField> Foam::dragModels::noDrag::CdRe() const
-{
-    const fvMesh& mesh(this->pair_.phase1().mesh());
-
-    return
-        tmp<volScalarField>
-        (
-            new volScalarField
-            (
-                IOobject
-                (
-                    "Cd",
-                    mesh.time().timeName(),
-                    mesh
-                ),
-                mesh,
-                dimensionedScalar("Cd", dimless, 0)
-            )
-        );
-}
-
-
-Foam::tmp<Foam::volScalarField> Foam::dragModels::noDrag::K() const
-{
-    return CdRe()*dimensionedScalar("zero", dimensionSet(1, -3, -1, 0, 0), 0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H
deleted file mode 100644
index b24267ee..00000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H
+++ /dev/null
@@ -1,97 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::dragModels::noDrag
-
-Description
-
-SourceFiles
-    noDrag.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef noDrag_H
-#define noDrag_H
-
-#include "dragModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-class phasePair;
-
-namespace dragModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class noDrag Declaration
-\*---------------------------------------------------------------------------*/
-
-class noDrag
-:
-    public dragModel
-{
-public:
-
-    //- Runtime type information
-    TypeName("none");
-
-
-    // Constructors
-
-        //- Construct from a dictionary and a phase pair
-        noDrag
-        (
-            const dictionary& dict,
-            const phasePair& pair,
-            const bool registerObject
-        );
-
-
-    //- Destructor
-    virtual ~noDrag();
-
-
-    // Member Functions
-
-        //- Drag coefficient
-        virtual tmp<volScalarField> CdRe() const;
-
-        //- The drag function used in the momentum equation
-        virtual tmp<volScalarField> K() const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace dragModels
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.C
deleted file mode 100644
index 1a4b3744..00000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.C
+++ /dev/null
@@ -1,87 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "noHeatTransfer.H"
-#include "phasePair.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace heatTransferModels
-{
-    defineTypeNameAndDebug(noHeatTransfer, 0);
-    addToRunTimeSelectionTable(heatTransferModel, noHeatTransfer, dictionary);
-}
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::heatTransferModels::noHeatTransfer::noHeatTransfer
-(
-    const dictionary& dict,
-    const phasePair& pair
-)
-:
-    heatTransferModel(dict, pair)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::heatTransferModels::noHeatTransfer::~noHeatTransfer()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::volScalarField>
-Foam::heatTransferModels::noHeatTransfer::K() const
-{
-    const fvMesh& mesh(this->pair_.phase1().mesh());
-
-    return
-        tmp<volScalarField>
-        (
-            new volScalarField
-            (
-                IOobject
-                (
-                    "zero",
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                mesh,
-                dimensionedScalar("zero", dimensionSet(1, -1, -3, -1, 0), 0)
-            )
-        );
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.H
deleted file mode 100644
index 5b171814..00000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.H
+++ /dev/null
@@ -1,93 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::heatTransferModels::noHeatTransfer
-
-Description
-
-SourceFiles
-    noHeatTransfer.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef noHeatTransfer_H
-#define noHeatTransfer_H
-
-#include "heatTransferModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-class phasePair;
-
-namespace heatTransferModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class noHeatTransfer Declaration
-\*---------------------------------------------------------------------------*/
-
-class noHeatTransfer
-:
-    public heatTransferModel
-{
-public:
-
-    //- Runtime type information
-    TypeName("none");
-
-
-    // Constructors
-
-        //- Construct from a dictionary and a phase pair
-        noHeatTransfer
-        (
-            const dictionary& dict,
-            const phasePair& pair
-        );
-
-
-    //- Destructor
-    virtual ~noHeatTransfer();
-
-
-    // Member Functions
-
-        //- The heat transfer function K used in the enthalpy equation
-        tmp<volScalarField> K() const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace heatTransferModels
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

From 3827b4ad60e021667c57172e1b139a38bb4277c8 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 3 Mar 2014 19:20:17 +0000
Subject: [PATCH 13/13] SchaefferFrictionalStress: phi input in deg as in
 JohnsonJacksonFrictionalStress Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1204

---
 .../JohnsonJackson/JohnsonJacksonFrictionalStress.C  | 12 +++++++-----
 .../Schaeffer/SchaefferFrictionalStress.C            |  9 ++++++---
 .../dimensionedType/dimensionedType.C                |  9 ++++++++-
 .../dimensionedType/dimensionedType.H                | 12 ++++++++----
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index b05277db..b71bb4f8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,10 +127,12 @@ bool Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::read()
 {
     coeffDict_ <<= dict_.subDict(typeName + "Coeffs");
 
-    Fr_.readIfPresent(coeffDict_);
-    eta_.readIfPresent(coeffDict_);
-    p_.readIfPresent(coeffDict_);
-    phi_.readIfPresent(coeffDict_);
+    Fr_.read(coeffDict_);
+    eta_.read(coeffDict_);
+    p_.read(coeffDict_);
+
+    phi_.read(coeffDict_);
+    phi_ *= constant::mathematical::pi/180.0;
 
     return true;
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index 537a76fe..705b66d6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,9 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::Schaeffer
     frictionalStressModel(dict),
     coeffDict_(dict.subDict(typeName + "Coeffs")),
     phi_("phi", dimless, coeffDict_.lookup("phi"))
-{}
+{
+    phi_ *= constant::mathematical::pi/180.0;
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -158,7 +160,8 @@ bool Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::read()
 {
     coeffDict_ <<= dict_.subDict(typeName + "Coeffs");
 
-    phi_.readIfPresent(coeffDict_);
+    phi_.read(coeffDict_);
+    phi_ *= constant::mathematical::pi/180.0;
 
     return true;
 }
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index d062c8ec..82f28aef 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -245,6 +245,13 @@ void Foam::dimensioned<Type>::replace
 }
 
 
+template<class Type>
+void Foam::dimensioned<Type>::read(const dictionary& dict)
+{
+    dict.lookup(name_) >> value_;
+}
+
+
 template<class Type>
 bool Foam::dimensioned<Type>::readIfPresent(const dictionary& dict)
 {
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 1c4a5c0d..47800b19 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -159,21 +159,25 @@ public:
         //- Return transpose.
         dimensioned<Type> T() const;
 
+        //- Update the value of dimensioned<Type>
+        void read(const dictionary&);
+
         //- Update the value of dimensioned<Type> if found in the dictionary.
         bool readIfPresent(const dictionary&);
 
 
     // I/O
 
-        //- Read using provided units. Only used during startup.
+        //- Read value from stream and units from dictionary
         Istream& read(Istream& is, const dictionary&);
 
-        //- Read using provided units
+        //- Read value from stream and units from table
         Istream& read(Istream& is, const HashTable<dimensionedScalar>&);
 
-        //- Read using system units
+        //- Read value from stream and units from system table
         Istream& read(Istream& is);
 
+
     // Member operators
 
         //- Return a component as a dimensioned<cmptType>