diff --git a/ReleaseNotes-dev b/ReleaseNotes-dev
index 815b97d862..fa6c09664b 100644
--- a/ReleaseNotes-dev
+++ b/ReleaseNotes-dev
@@ -184,6 +184,8 @@
     + =setSet=: allows time range (e.g. 0:100) in combination with -batch argument
     to execute the commands for multiple times.
 * Post-processing
+  + =paraFoam=, =foamToVTK=: full support for polyhedral cell type in recent
+     Paraview versions.
   + =foamToEnsight=: parallel continuous data. new =-nodeValues= option to generate and output nodal
     field data.
   + =singleCellMesh=: new utility to convert mesh and fields to a single cell
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index ee2300d91e..436d373b04 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -218,7 +218,7 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     //  The solution is higly unstable close to the packing limit.
     gs0_ = radialModel_->g0
     (
-        min(max(alpha_, 1e-6), alphaMax_ - 0.01),
+        min(max(alpha_, scalar(1e-6)), alphaMax_ - 0.01),
         alphaMax_
     );
 
@@ -255,7 +255,7 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
     volScalarField J1 = 3.0*betaPrim;
     volScalarField J2 =
         0.25*sqr(betaPrim)*da_*sqr(Ur)
-       /(max(alpha_, 1e-6)*rhoa_*sqrtPi*(ThetaSqrt + TsmallSqrt));
+       /(max(alpha_, scalar(1e-6))*rhoa_*sqrtPi*(ThetaSqrt + TsmallSqrt));
 
     // bulk viscosity  p. 45 (Lun et al. 1984).
     lambda_ = (4.0/3.0)*sqr(alpha_)*rhoa_*da_*gs0_*(1.0+e_)*ThetaSqrt/sqrtPi;
@@ -309,7 +309,11 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradUat)
         volScalarField t1 = K1*alpha_ + rhoa_;
         volScalarField l1 = -t1*trD;
         volScalarField l2 = sqr(t1)*tr2D;
-        volScalarField l3 = 4.0*K4*max(alpha_, 1e-6)*(2.0*K3*trD2 + K2*tr2D);
+        volScalarField l3 =
+            4.0
+           *K4
+           *max(alpha_, scalar(1e-6))
+           *(2.0*K3*trD2 + K2*tr2D);
 
         Theta_ = sqr((l1 + sqrt(l2 + l3))/(2.0*(alpha_ + 1.0e-4)*K4));
     }
diff --git a/applications/test/momentOfInertia/Make/options b/applications/test/momentOfInertia/Make/options
index 54c035b8f5..0b32f3355b 100644
--- a/applications/test/momentOfInertia/Make/options
+++ b/applications/test/momentOfInertia/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
     -lmeshTools
diff --git a/applications/test/momentOfInertia/Test-momentOfInertia.C b/applications/test/momentOfInertia/Test-momentOfInertia.C
index 9a8ae40a5a..22327f1bdd 100644
--- a/applications/test/momentOfInertia/Test-momentOfInertia.C
+++ b/applications/test/momentOfInertia/Test-momentOfInertia.C
@@ -26,180 +26,38 @@ Application
 
 Description
     Calculates the inertia tensor and principal axes and moments of a
-    test face and tetrahedron.
+    test face, tetrahedron and mesh.
 
 \*---------------------------------------------------------------------------*/
 
+#include "argList.H"
+#include "Time.H"
+#include "polyMesh.H"
 #include "ListOps.H"
 #include "face.H"
 #include "tetPointRef.H"
 #include "triFaceList.H"
 #include "OFstream.H"
 #include "meshTools.H"
+#include "momentOfInertia.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 using namespace Foam;
 
-void massPropertiesSolid
-(
-    const pointField& pts,
-    const triFaceList triFaces,
-    scalar density,
-    scalar& mass,
-    vector& cM,
-    tensor& J
-)
-{
-    // Reimplemented from: Wm4PolyhedralMassProperties.cpp
-    // File Version: 4.10.0 (2009/11/18)
-
-    // Geometric Tools, LC
-    // Copyright (c) 1998-2010
-    // Distributed under the Boost Software License, Version 1.0.
-    // http://www.boost.org/LICENSE_1_0.txt
-    // http://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-
-    // Boost Software License - Version 1.0 - August 17th, 2003
-
-    // Permission is hereby granted, free of charge, to any person or
-    // organization obtaining a copy of the software and accompanying
-    // documentation covered by this license (the "Software") to use,
-    // reproduce, display, distribute, execute, and transmit the
-    // Software, and to prepare derivative works of the Software, and
-    // to permit third-parties to whom the Software is furnished to do
-    // so, all subject to the following:
-
-    // The copyright notices in the Software and this entire
-    // statement, including the above license grant, this restriction
-    // and the following disclaimer, must be included in all copies of
-    // the Software, in whole or in part, and all derivative works of
-    // the Software, unless such copies or derivative works are solely
-    // in the form of machine-executable object code generated by a
-    // source language processor.
-
-    // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-    // OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
-    // NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-    // ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR
-    // OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-    // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-    // USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    const scalar r6 = 1.0/6.0;
-    const scalar r24 = 1.0/24.0;
-    const scalar r60 = 1.0/60.0;
-    const scalar r120 = 1.0/120.0;
-
-    // order:  1, x, y, z, x^2, y^2, z^2, xy, yz, zx
-    scalarField integrals(10, 0.0);
-
-    forAll(triFaces, i)
-    {
-        const triFace& tri(triFaces[i]);
-
-        // vertices of triangle i
-        vector v0 = pts[tri[0]];
-        vector v1 = pts[tri[1]];
-        vector v2 = pts[tri[2]];
-
-        // cross product of edges
-        vector eA = v1 - v0;
-        vector eB = v2 - v0;
-        vector n = eA ^ eB;
-
-        // compute integral terms
-        scalar tmp0, tmp1, tmp2;
-
-        scalar f1x, f2x, f3x, g0x, g1x, g2x;
-
-        tmp0 = v0.x() + v1.x();
-        f1x = tmp0 + v2.x();
-        tmp1 = v0.x()*v0.x();
-        tmp2 = tmp1 + v1.x()*tmp0;
-        f2x = tmp2 + v2.x()*f1x;
-        f3x = v0.x()*tmp1 + v1.x()*tmp2 + v2.x()*f2x;
-        g0x = f2x + v0.x()*(f1x + v0.x());
-        g1x = f2x + v1.x()*(f1x + v1.x());
-        g2x = f2x + v2.x()*(f1x + v2.x());
-
-        scalar f1y, f2y, f3y, g0y, g1y, g2y;
-
-        tmp0 = v0.y() + v1.y();
-        f1y = tmp0 + v2.y();
-        tmp1 = v0.y()*v0.y();
-        tmp2 = tmp1 + v1.y()*tmp0;
-        f2y = tmp2 + v2.y()*f1y;
-        f3y = v0.y()*tmp1 + v1.y()*tmp2 + v2.y()*f2y;
-        g0y = f2y + v0.y()*(f1y + v0.y());
-        g1y = f2y + v1.y()*(f1y + v1.y());
-        g2y = f2y + v2.y()*(f1y + v2.y());
-
-        scalar f1z, f2z, f3z, g0z, g1z, g2z;
-
-        tmp0 = v0.z() + v1.z();
-        f1z = tmp0 + v2.z();
-        tmp1 = v0.z()*v0.z();
-        tmp2 = tmp1 + v1.z()*tmp0;
-        f2z = tmp2 + v2.z()*f1z;
-        f3z = v0.z()*tmp1 + v1.z()*tmp2 + v2.z()*f2z;
-        g0z = f2z + v0.z()*(f1z + v0.z());
-        g1z = f2z + v1.z()*(f1z + v1.z());
-        g2z = f2z + v2.z()*(f1z + v2.z());
-
-        // update integrals
-        integrals[0] += n.x()*f1x;
-        integrals[1] += n.x()*f2x;
-        integrals[2] += n.y()*f2y;
-        integrals[3] += n.z()*f2z;
-        integrals[4] += n.x()*f3x;
-        integrals[5] += n.y()*f3y;
-        integrals[6] += n.z()*f3z;
-        integrals[7] += n.x()*(v0.y()*g0x + v1.y()*g1x + v2.y()*g2x);
-        integrals[8] += n.y()*(v0.z()*g0y + v1.z()*g1y + v2.z()*g2y);
-        integrals[9] += n.z()*(v0.x()*g0z + v1.x()*g1z + v2.x()*g2z);
-    }
-
-    integrals[0] *= r6;
-    integrals[1] *= r24;
-    integrals[2] *= r24;
-    integrals[3] *= r24;
-    integrals[4] *= r60;
-    integrals[5] *= r60;
-    integrals[6] *= r60;
-    integrals[7] *= r120;
-    integrals[8] *= r120;
-    integrals[9] *= r120;
-
-    // mass
-    mass = integrals[0];
-
-    // center of mass
-    cM = vector(integrals[1], integrals[2], integrals[3])/mass;
-
-    // inertia relative to origin
-    J.xx() = integrals[5] + integrals[6];
-    J.xy() = -integrals[7];
-    J.xz() = -integrals[9];
-    J.yx() = J.xy();
-    J.yy() = integrals[4] + integrals[6];
-    J.yz() = -integrals[8];
-    J.zx() = J.xz();
-    J.zy() = J.yz();
-    J.zz() = integrals[4] + integrals[5];
-
-    // inertia relative to center of mass
-    J -= mass*((cM & cM)*I - cM*cM);
-
-    // Apply density
-    mass *= density;
-    J *= density;
-}
-
-
 int main(int argc, char *argv[])
 {
+    argList::addOption
+    (
+        "cell",
+        "label",
+        "cell to use for inertia calculation, defaults to 0"
+    );
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createPolyMesh.H"
+
     scalar density = 1.0;
 
     {
@@ -286,16 +144,7 @@ int main(int argc, char *argv[])
         vector cM = vector::zero;
         tensor J = tensor::zero;
 
-        massPropertiesSolid
-        (
-
-            pts,
-            tetFaces,
-            density,
-            m,
-            cM,
-            J
-        );
+        momentOfInertia::massPropertiesSolid(pts, tetFaces, density, m, cM, J);
 
         vector eVal = eigenValues(J);
 
@@ -344,7 +193,50 @@ int main(int argc, char *argv[])
         {
             str << "l " << nPts + 1 << ' ' << i + 1 << endl;
         }
+    }
 
+    {
+        const label cellI = args.optionLookupOrDefault("cell", 0);
+
+        tensorField mI = momentOfInertia::meshInertia(mesh);
+
+        tensor& J = mI[cellI];
+
+        vector eVal = eigenValues(J);
+
+        Info<< nl
+            << "Inertia tensor of cell " << cellI << " " << J << nl
+            << "eigenValues (principal moments) " << eVal << endl;
+
+        J /= cmptMax(eVal);
+
+        tensor eVec = eigenVectors(J);
+
+        Info<< "eigenVectors (principal axes, from normalised inertia) " << eVec
+            << endl;
+
+        OFstream str("cell_" + name(cellI) + "_inertia.obj");
+
+        Info<< nl << "Writing scaled principal axes of cell " << cellI << " to "
+            << str.name() << endl;
+
+        const point& cC = mesh.cellCentres()[cellI];
+
+        scalar scale = mag
+        (
+            (cC - mesh.faceCentres()[mesh.cells()[cellI][0]])
+           /eVal.component(findMin(eVal))
+        );
+
+        meshTools::writeOBJ(str, cC);
+        meshTools::writeOBJ(str, cC + scale*eVal.x()*eVec.x());
+        meshTools::writeOBJ(str, cC + scale*eVal.y()*eVec.y());
+        meshTools::writeOBJ(str, cC + scale*eVal.z()*eVec.z());
+
+        for (label i = 1; i < 4; i++)
+        {
+            str << "l " << 1 << ' ' << i + 1 << endl;
+        }
     }
 
     Info<< nl << "End" << nl << endl;
diff --git a/applications/utilities/mesh/generation/extrudeMesh/Allwclean b/applications/utilities/mesh/generation/extrude/Allwclean
similarity index 79%
rename from applications/utilities/mesh/generation/extrudeMesh/Allwclean
rename to applications/utilities/mesh/generation/extrude/Allwclean
index 3ac620b145..c1c94a806b 100755
--- a/applications/utilities/mesh/generation/extrudeMesh/Allwclean
+++ b/applications/utilities/mesh/generation/extrude/Allwclean
@@ -3,6 +3,7 @@ cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 wclean libso extrudeModel
-wclean
+wclean extrudeMesh
+wclean extrudeToRegionMesh
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/extrudeMesh/Allwmake b/applications/utilities/mesh/generation/extrude/Allwmake
similarity index 79%
rename from applications/utilities/mesh/generation/extrudeMesh/Allwmake
rename to applications/utilities/mesh/generation/extrude/Allwmake
index 871cad2b68..091ec04743 100755
--- a/applications/utilities/mesh/generation/extrudeMesh/Allwmake
+++ b/applications/utilities/mesh/generation/extrude/Allwmake
@@ -3,6 +3,8 @@ cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 wmake libso extrudeModel
-wmake
+wmake extrudeMesh
+wmake extrudeToRegionMesh
+
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/extrudeMesh/Make/files b/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/Make/files
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/Make/files
diff --git a/applications/utilities/mesh/generation/extrudeMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
similarity index 89%
rename from applications/utilities/mesh/generation/extrudeMesh/Make/options
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
index 1cdc68a2c7..9a10a36f3c 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
     -IextrudedMesh \
-    -IextrudeModel/lnInclude \
+    -I../extrudeModel/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/applications/utilities/mesh/generation/extrudeMesh/createTimeExtruded.H b/applications/utilities/mesh/generation/extrude/extrudeMesh/createTimeExtruded.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/createTimeExtruded.H
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/createTimeExtruded.H
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
similarity index 99%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 6de1574703..0b0ad610bc 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -214,9 +214,8 @@ int main(int argc, char *argv[])
     (
         IOobject
         (
-            "extrudeProperties",
-            runTimeExtruded.constant(),
-            regionDir,
+            "extrudeMeshDict",
+            runTimeExtruded.system(),
             runTimeExtruded,
             IOobject::MUST_READ_IF_MODIFIED
         )
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict
similarity index 98%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeProperties
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict
index c820e3f8a8..a38614047b 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      extrudeProperties;
+    object      extrudeMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.H b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.H
rename to applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/files b/applications/utilities/mesh/generation/extrude/extrudeModel/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/files
rename to applications/utilities/mesh/generation/extrude/extrudeModel/Make/files
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/options b/applications/utilities/mesh/generation/extrude/extrudeModel/Make/options
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/options
rename to applications/utilities/mesh/generation/extrude/extrudeModel/Make/options
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModel.C b/applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModel.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModel.H b/applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModel.H
rename to applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.H
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModelNew.C b/applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModelNew.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModelNew.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModelNew.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearDirection/linearDirection.C b/applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearDirection/linearDirection.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearDirection/linearDirection.H b/applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.H
similarity index 98%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearDirection/linearDirection.H
rename to applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.H
index 4d26ee56f5..7776a47986 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearDirection/linearDirection.H
+++ b/applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.H
@@ -71,7 +71,7 @@ public:
 
 
     //- Destructor
-    ~linearDirection();
+    virtual ~linearDirection();
 
 
     // Member Operators
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.C b/applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.H b/applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.H
similarity index 98%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.H
rename to applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.H
index 62ae81bffb..4bdb9a080b 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.H
+++ b/applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.H
@@ -68,7 +68,7 @@ public:
 
 
     //- Destructor
-    ~linearNormal();
+    virtual ~linearNormal();
 
 
     // Member Operators
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C b/applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H b/applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.H
similarity index 98%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H
rename to applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.H
index 04f19764ba..8ec941f901 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H
+++ b/applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.H
@@ -66,7 +66,7 @@ public:
 
 
     //- Destructor
-    ~linearRadial();
+    virtual ~linearRadial();
 
 
     // Member Operators
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/sigmaRadial/sigmaRadial.C b/applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/sigmaRadial/sigmaRadial.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/sigmaRadial/sigmaRadial.H b/applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.H
similarity index 98%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/sigmaRadial/sigmaRadial.H
rename to applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.H
index e55c81bfe4..23c709ecbd 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/sigmaRadial/sigmaRadial.H
+++ b/applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.H
@@ -67,7 +67,7 @@ public:
 
 
     //-Destructor
-    ~sigmaRadial();
+    virtual ~sigmaRadial();
 
 
     // Member Operators
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.C b/applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.C
rename to applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.H b/applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.H
similarity index 98%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.H
rename to applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.H
index a936e798e4..ec539d8395 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.H
+++ b/applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.H
@@ -80,8 +80,8 @@ public:
         wedge(const dictionary& dict);
 
 
-    //- Destrcuctor
-    ~wedge();
+    //- Destructor
+    virtual ~wedge();
 
 
     // Member Operators
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/files b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/Make/files
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/files
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
similarity index 78%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
index 7c1ab5a64a..abe16677f5 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
@@ -1,9 +1,11 @@
 EXE_INC = \
+    -I../extrudeModel/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
 EXE_LIBS = \
+    -lextrudeModel \
     -lfiniteVolume \
     -lmeshTools \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.C
similarity index 59%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.C
index 4034428bfb..543e5550a2 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.C
@@ -93,7 +93,7 @@ void Foam::createShellMesh::calcPointRegions
                         label fp2 = findIndex(f2, pointI);
                         label& region = pointRegions[face2][fp2];
                         if (region != -1)
-                        {   
+                        {
                             FatalErrorIn
                             (
                                 "createShellMesh::calcPointRegions(..)"
@@ -185,18 +185,20 @@ Foam::createShellMesh::createShellMesh
 
 void Foam::createShellMesh::setRefinement
 (
-    const pointField& thickness,
+    const pointField& firstLayerDisp,
+    const scalar expansionRatio,
+    const label nLayers,
     const labelList& topPatchID,
     const labelList& bottomPatchID,
     const labelListList& extrudeEdgePatches,
     polyTopoChange& meshMod
 )
 {
-    if (thickness.size() != regionPoints_.size())
+    if (firstLayerDisp.size() != regionPoints_.size())
     {
         FatalErrorIn("createShellMesh::setRefinement(..)")
             << "nRegions:" << regionPoints_.size()
-            << " thickness:" << thickness.size()
+            << " firstLayerDisp:" << firstLayerDisp.size()
             << exit(FatalError);
     }
 
@@ -224,30 +226,36 @@ void Foam::createShellMesh::setRefinement
 
 
     // From cell to patch (trivial)
-    DynamicList<label> cellToFaceMap(patch_.size());
+    DynamicList<label> cellToFaceMap(nLayers*patch_.size());
     // From face to patch+turning index
-    DynamicList<label> faceToFaceMap(2*patch_.size()+patch_.nEdges());
+    DynamicList<label> faceToFaceMap
+    (
+        (nLayers+1)*(patch_.size()+patch_.nEdges())
+    );
     // From face to patch edge index
-    DynamicList<label> faceToEdgeMap(patch_.nEdges()+patch_.nEdges());
+    DynamicList<label> faceToEdgeMap(nLayers*(patch_.nEdges()+patch_.nEdges()));
     // From point to patch point index
-    DynamicList<label> pointToPointMap(2*patch_.nPoints());
+    DynamicList<label> pointToPointMap((nLayers+1)*patch_.nPoints());
 
 
     // Introduce new cell for every face
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    labelList addedCells(patch_.size());
+    labelList addedCells(nLayers*patch_.size());
     forAll(patch_, faceI)
     {
-        addedCells[faceI] = meshMod.addCell
-        (
-            -1,                     // masterPointID
-            -1,                     // masterEdgeID
-            -1,                     // masterFaceID
-            cellToFaceMap.size(),   // masterCellID
-            -1                      // zoneID
-        );
-        cellToFaceMap.append(faceI);
+        for (label layerI = 0; layerI < nLayers; layerI++)
+        {
+            addedCells[nLayers*faceI+layerI] = meshMod.addCell
+            (
+                -1,                     // masterPointID
+                -1,                     // masterEdgeID
+                -1,                     // masterFaceID
+                cellToFaceMap.size(),   // masterCellID
+                -1                      // zoneID
+            );
+            cellToFaceMap.append(faceI);
+        }
     }
 
 
@@ -261,7 +269,7 @@ void Foam::createShellMesh::setRefinement
         meshMod.addPoint
         (
             patch_.localPoints()[pointI],   // point
-            pointToPointMap.size(),         // masterPointID 
+            pointToPointMap.size(),         // masterPointID
             -1,                             // zoneID
             true                            // inCell
         );
@@ -277,25 +285,28 @@ void Foam::createShellMesh::setRefinement
     // Introduce new points (one for every region)
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    labelList addedPoints(regionPoints_.size());
+    labelList addedPoints(nLayers*regionPoints_.size());
     forAll(regionPoints_, regionI)
     {
         label pointI = regionPoints_[regionI];
-        point extrudedPt = patch_.localPoints()[pointI] + thickness[regionI];
 
-        addedPoints[regionI] = meshMod.addPoint
-        (
-            extrudedPt,             // point
-            pointToPointMap.size(), // masterPointID - used only addressing
-            -1,                     // zoneID
-            true                    // inCell
-        );
-        pointToPointMap.append(pointI);
+        point pt = patch_.localPoints()[pointI];
+        point disp = firstLayerDisp[regionI];
+        for (label layerI = 0; layerI < nLayers; layerI++)
+        {
+            pt += disp;
 
-        //Pout<< "Added top point " << addedPoints[regionI]
-        //    << " at " << extrudedPt
-        //    << "  from point " << pointI
-        //    << endl;
+            addedPoints[nLayers*regionI+layerI] = meshMod.addPoint
+            (
+                pt,                     // point
+                pointToPointMap.size(), // masterPointID - used only addressing
+                -1,                     // zoneID
+                true                    // inCell
+            );
+            pointToPointMap.append(pointI);
+
+            disp *= expansionRatio;
+        }
     }
 
 
@@ -305,61 +316,84 @@ void Foam::createShellMesh::setRefinement
         meshMod.addFace
         (
             patch_.localFaces()[faceI].reverseFace(),// vertices
-            addedCells[faceI],          // own
+            addedCells[nLayers*faceI],  // own
             -1,                         // nei
             -1,                         // masterPointID
             -1,                         // masterEdgeID
             faceToFaceMap.size(),       // masterFaceID : current faceI
             true,                       // flipFaceFlux
-            bottomPatchID[faceI],// patchID
+            bottomPatchID[faceI],       // patchID
             -1,                         // zoneID
             false                       // zoneFlip
         );
         faceToFaceMap.append(-faceI-1); // points to flipped original face
         faceToEdgeMap.append(-1);
 
+        //const face newF(patch_.localFaces()[faceI].reverseFace());
         //Pout<< "Added bottom face "
-        //    << patch_.localFaces()[faceI].reverseFace()
+        //    << newF
+        //    << " coords:" << UIndirectList<point>(meshMod.points(), newF)
         //    << " own " << addedCells[faceI]
+        //    << " patch:" << bottomPatchID[faceI]
         //    << "  at " << patch_.faceCentres()[faceI]
         //    << endl;
-
     }
 
-    // Add face on top
+    // Add inbetween faces and face on top
     forAll(patch_.localFaces(), faceI)
     {
         // Get face in original ordering
         const face& f = patch_.localFaces()[faceI];
 
-        // Pick up point based on region
         face newF(f.size());
-        forAll(f, fp)
+
+        for (label layerI = 0; layerI < nLayers; layerI++)
         {
-            label region = pointRegions_[faceI][fp];
-            newF[fp] = addedPoints[region];
+            // Pick up point based on region and layer
+            forAll(f, fp)
+            {
+                label region = pointRegions_[faceI][fp];
+                newF[fp] = addedPoints[region*nLayers+layerI];
+            }
+
+            label own = addedCells[faceI*nLayers+layerI];
+            label nei;
+            label patchI;
+            if (layerI == nLayers-1)
+            {
+                nei = -1;
+                patchI = topPatchID[faceI];
+            }
+            else
+            {
+                nei = addedCells[faceI*nLayers+layerI+1];
+                patchI = -1;
+            }
+
+            meshMod.addFace
+            (
+                newF,                       // vertices
+                own,                        // own
+                nei,                        // nei
+                -1,                         // masterPointID
+                -1,                         // masterEdgeID
+                faceToFaceMap.size(),       // masterFaceID : current faceI
+                false,                      // flipFaceFlux
+                patchI,                     // patchID
+                -1,                         // zoneID
+                false                       // zoneFlip
+            );
+            faceToFaceMap.append(faceI+1);  // unflipped
+            faceToEdgeMap.append(-1);
+
+            //Pout<< "Added inbetween face " << newF
+            //    << " coords:" << UIndirectList<point>(meshMod.points(), newF)
+            //    << " at layer " << layerI
+            //    << " own " << own
+            //    << " nei " << nei
+            //    << "  at " << patch_.faceCentres()[faceI]
+            //    << endl;
         }
-
-        meshMod.addFace
-        (
-            newF,                       // vertices
-            addedCells[faceI],          // own
-            -1,                         // nei
-            -1,                         // masterPointID
-            -1,                         // masterEdgeID
-            faceToFaceMap.size(),       // masterFaceID : current faceI
-            false,                      // flipFaceFlux
-            topPatchID[faceI],          // patchID
-            -1,                         // zoneID
-            false                       // zoneFlip
-        );
-        faceToFaceMap.append(faceI+1);  // unflipped
-        faceToEdgeMap.append(-1);
-
-        //Pout<< "Added top face " << newF
-        //    << " own " << addedCells[faceI]
-        //    << "  at " << patch_.faceCentres()[faceI]
-        //    << endl;
     }
 
 
@@ -376,8 +410,7 @@ void Foam::createShellMesh::setRefinement
 
         if (ePatches.size() == 0)
         {
-            // internal face.
-
+            // Internal face
             if (eFaces.size() != 2)
             {
                 FatalErrorIn("createShellMesh::setRefinement(..)")
@@ -385,61 +418,6 @@ void Foam::createShellMesh::setRefinement
                     << " not internal but does not have side-patches defined."
                     << exit(FatalError);
             }
-
-            // Extrude
-
-            // Make face pointing in to eFaces[0] so out of new master face
-            const face& f = patch_.localFaces()[eFaces[0]];
-            const edge& e = patch_.edges()[edgeI];
-
-            label fp0 = findIndex(f, e[0]);
-            label fp1 = f.fcIndex(fp0);
-
-            if (f[fp1] != e[1])
-            {
-                fp1 = fp0;
-                fp0 = f.rcIndex(fp1);
-            }
-
-            face newF(4);
-            newF[0] = f[fp0];
-            newF[1] = f[fp1];
-            newF[2] = addedPoints[pointRegions_[eFaces[0]][fp1]];
-            newF[3] = addedPoints[pointRegions_[eFaces[0]][fp0]];
-
-            label minCellI = addedCells[eFaces[0]];
-            label maxCellI = addedCells[eFaces[1]];
-
-            if (minCellI > maxCellI)
-            {
-                // Swap
-                Swap(minCellI, maxCellI);
-                newF = newF.reverseFace();
-            }
-
-            //Pout<< "for internal edge:" << e
-            //    << " at:" << patch_.localPoints()[e[0]]
-            //    << patch_.localPoints()[e[1]]
-            //    << " adding face:" << newF
-            //    << " from f:" << f
-            //    << " inbetween " << minCellI << " and " << maxCellI << endl;
-
-            // newF already outwards pointing.
-            meshMod.addFace
-            (
-                newF,       // vertices
-                minCellI,   // own
-                maxCellI,   // nei
-                -1,         // masterPointID
-                -1,         // masterEdgeID
-                faceToFaceMap.size(),   // masterFaceID
-                false,      // flipFaceFlux
-                -1,         // patchID
-                -1,         // zoneID
-                false       // zoneFlip
-            );
-            faceToFaceMap.append(0);
-            faceToEdgeMap.append(edgeI);
         }
         else
         {
@@ -451,52 +429,91 @@ void Foam::createShellMesh::setRefinement
                     << " but only " << ePatches.size()
                     << " boundary faces defined." << exit(FatalError);
             }
+        }
 
 
-            // Extrude eFaces[0]
-            label minFaceI = eFaces[0];
 
-            // Make face pointing in to eFaces[0] so out of new master face
-            const face& f = patch_.localFaces()[minFaceI];
+        // Make face pointing in to eFaces[0] so out of new master face
+        const face& f = patch_.localFaces()[eFaces[0]];
+        const edge& e = patch_.edges()[edgeI];
 
-            const edge& e = patch_.edges()[edgeI];
-            label fp0 = findIndex(f, e[0]);
-            label fp1 = f.fcIndex(fp0);
+        label fp0 = findIndex(f, e[0]);
+        label fp1 = f.fcIndex(fp0);
 
-            if (f[fp1] != e[1])
+        if (f[fp1] != e[1])
+        {
+            fp1 = fp0;
+            fp0 = f.rcIndex(fp1);
+        }
+
+        face newF(4);
+
+        for (label layerI = 0; layerI < nLayers; layerI++)
+        {
+            label region0 = pointRegions_[eFaces[0]][fp0];
+            label region1 = pointRegions_[eFaces[0]][fp1];
+
+            if (layerI == 0)
             {
-                fp1 = fp0;
-                fp0 = f.rcIndex(fp1);
+                newF[0] = f[fp0];
+                newF[1] = f[fp1];
+                newF[2] = addedPoints[nLayers*region1+layerI];
+                newF[3] = addedPoints[nLayers*region0+layerI];
+            }
+            else
+            {
+                newF[0] = addedPoints[nLayers*region0+layerI-1];
+                newF[1] = addedPoints[nLayers*region1+layerI-1];
+                newF[2] = addedPoints[nLayers*region1+layerI];
+                newF[3] = addedPoints[nLayers*region0+layerI];
             }
 
-            face newF(4);
-            newF[0] = f[fp0];
-            newF[1] = f[fp1];
-            newF[2] = addedPoints[pointRegions_[minFaceI][fp1]];
-            newF[3] = addedPoints[pointRegions_[minFaceI][fp0]];
+            label minCellI = addedCells[nLayers*eFaces[0]+layerI];
+            label maxCellI;
+            label patchI;
+            if (ePatches.size() == 0)
+            {
+                maxCellI = addedCells[nLayers*eFaces[1]+layerI];
+                if (minCellI > maxCellI)
+                {
+                    // Swap
+                    Swap(minCellI, maxCellI);
+                    newF = newF.reverseFace();
+                }
+                patchI = -1;
+            }
+            else
+            {
+                maxCellI = -1;
+                patchI = ePatches[0];
+            }
 
-
-            //Pout<< "for external edge:" << e
-            //    << " at:" << patch_.localPoints()[e[0]]
-            //    << patch_.localPoints()[e[1]]
-            //    << " adding first patch face:" << newF
-            //    << " from:" << f
-            //    << " into patch:" << ePatches[0]
-            //    << " own:" << addedCells[minFaceI]
-            //    << endl;
+            //{
+            //    Pout<< "Adding from face:" << patch_.faceCentres()[eFaces[0]]
+            //        << " from edge:"
+            //        << patch_.localPoints()[f[fp0]]
+            //        << patch_.localPoints()[f[fp1]]
+            //        << " at layer:" << layerI
+            //        << " with new points:" << newF
+            //        << " locations:"
+            //        << UIndirectList<point>(meshMod.points(), newF)
+            //        << " own:" << minCellI
+            //        << " nei:" << maxCellI
+            //        << endl;
+            //}
 
 
             // newF already outwards pointing.
             meshMod.addFace
             (
                 newF,                   // vertices
-                addedCells[minFaceI],   // own
-                -1,                     // nei
+                minCellI,               // own
+                maxCellI,               // nei
                 -1,                     // masterPointID
                 -1,                     // masterEdgeID
                 faceToFaceMap.size(),   // masterFaceID
                 false,                  // flipFaceFlux
-                ePatches[0],            // patchID
+                patchI,                 // patchID
                 -1,                     // zoneID
                 false                   // zoneFlip
             );
@@ -532,35 +549,57 @@ void Foam::createShellMesh::setRefinement
                 }
 
                 face newF(4);
-                newF[0] = f[fp0];
-                newF[1] = f[fp1];
-                newF[2] = addedPoints[pointRegions_[minFaceI][fp1]];
-                newF[3] = addedPoints[pointRegions_[minFaceI][fp0]];
+                for (label layerI = 0; layerI < nLayers; layerI++)
+                {
+                    label region0 = pointRegions_[minFaceI][fp0];
+                    label region1 = pointRegions_[minFaceI][fp1];
 
-                //Pout<< "for external edge:" << e
-                //    << " at:" << patch_.localPoints()[e[0]]
-                //    << patch_.localPoints()[e[1]]
-                //    << " adding patch face:" << newF
-                //    << " from:" << f
-                //    << " into patch:" << ePatches[i]
-                //    << endl;
+                    if (layerI == 0)
+                    {
+                        newF[0] = f[fp0];
+                        newF[1] = f[fp1];
+                        newF[2] = addedPoints[nLayers*region1+layerI];
+                        newF[3] = addedPoints[nLayers*region0+layerI];
+                    }
+                    else
+                    {
+                        newF[0] = addedPoints[nLayers*region0+layerI-1];
+                        newF[1] = addedPoints[nLayers*region1+layerI-1];
+                        newF[2] = addedPoints[nLayers*region1+layerI];
+                        newF[3] = addedPoints[nLayers*region0+layerI];
+                    }
 
-                // newF already outwards pointing.
-                meshMod.addFace
-                (
-                    newF,                   // vertices
-                    addedCells[minFaceI],   // own
-                    -1,                     // nei
-                    -1,                     // masterPointID
-                    -1,                     // masterEdgeID
-                    faceToFaceMap.size(),   // masterFaceID
-                    false,                  // flipFaceFlux
-                    ePatches[i],            // patchID
-                    -1,                     // zoneID
-                    false                   // zoneFlip
-                );
-                faceToFaceMap.append(0);
-                faceToEdgeMap.append(edgeI);
+                    ////if (ePatches.size() == 0)
+                    //{
+                    //    Pout<< "Adding from MULTI face:"
+                    //        << patch_.faceCentres()[minFaceI]
+                    //        << " from edge:"
+                    //        << patch_.localPoints()[f[fp0]]
+                    //        << patch_.localPoints()[f[fp1]]
+                    //        << " at layer:" << layerI
+                    //        << " with new points:" << newF
+                    //        << " locations:"
+                    //        << UIndirectList<point>(meshMod.points(), newF)
+                    //        << endl;
+                    //}
+
+                    // newF already outwards pointing.
+                    meshMod.addFace
+                    (
+                        newF,                   // vertices
+                        addedCells[nLayers*minFaceI+layerI],   // own
+                        -1,                     // nei
+                        -1,                     // masterPointID
+                        -1,                     // masterEdgeID
+                        faceToFaceMap.size(),   // masterFaceID
+                        false,                  // flipFaceFlux
+                        ePatches[i],            // patchID
+                        -1,                     // zoneID
+                        false                   // zoneFlip
+                    );
+                    faceToFaceMap.append(0);
+                    faceToEdgeMap.append(edgeI);
+                }
             }
         }
     }
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.H b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.H
similarity index 93%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.H
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.H
index 132e70f1fb..1cb691f38c 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/createShellMesh.H
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.H
@@ -109,7 +109,8 @@ public:
 
         // Access
 
-            //- From region cell to patch face
+            //- From region cell to patch face. Consecutively added so
+            //  cell at layerI is at patchFaceI*nLayers+layerI
             const labelList& cellToFaceMap() const
             {
                 return cellToFaceMap_;
@@ -120,7 +121,7 @@ public:
             //            be in top patch
             //      < 0 : face in opposite orientation as patch face. face will
             //            be in bottom patch
-            //      = 0 : for all side faces
+            //      = 0 : for all side and internal faces
             const labelList& faceToFaceMap() const
             {
                 return faceToFaceMap_;
@@ -153,7 +154,9 @@ public:
             //- Play commands into polyTopoChange to create layer mesh.
             void setRefinement
             (
-                const pointField& thickness,
+                const pointField& firstLayerThickness,
+                const scalar expansionRatio,
+                const label nLayers,
                 const labelList& topPatchID,
                 const labelList& bottomPatchID,
                 const labelListList& extrudeEdgePatches,
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
similarity index 97%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index fb019694da..87c936fe21 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -133,6 +133,7 @@ Usage
 #include "syncTools.H"
 #include "cyclicPolyPatch.H"
 #include "nonuniformTransformCyclicPolyPatch.H"
+#include "extrudeModel.H"
 
 using namespace Foam;
 
@@ -689,39 +690,6 @@ void countExtrudePatches
 }
 
 
-// Lexical ordering for vectors.
-bool lessThan(const point& x, const point& y)
-{
-    for (direction dir = 0; dir < point::nComponents; dir++)
-    {
-        if (x[dir] < y[dir]) return true;
-        if (x[dir] > y[dir]) return false;
-    }
-    return false;
-}
-
-
-// Combine vectors
-class minEqVectorOp
-{
-    public:
-    void operator()(vector& x, const vector& y) const
-    {
-        if (y != vector::zero)
-        {
-            if (x == vector::zero)
-            {
-                x = y;
-            }
-            else if (lessThan(y, x))
-            {
-                x = y;
-            }
-        }
-    }
-};
-
-
 // Constrain&sync normals on points that are on coupled patches to make sure
 // the face extruded from the edge has a valid normal with its coupled
 // equivalent.
@@ -846,14 +814,14 @@ void constrainCoupledNormals
     (
         mesh,
         edgeNormals0,
-        minEqVectorOp(),
+        maxMagSqrEqOp<vector>(),
         vector::zero            // nullValue
     );
     syncTools::syncEdgeList
     (
         mesh,
         edgeNormals1,
-        minEqVectorOp(),
+        maxMagSqrEqOp<vector>(),
         vector::zero            // nullValue
     );
 
@@ -951,14 +919,9 @@ tmp<pointField> calcOffset
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-    argList::validArgs.append("shellRegion");
-    argList::validArgs.append("faceZones");
-    argList::validArgs.append("thickness");
-
-    Foam::argList::addBoolOption
+    argList::addNote
     (
-        "oneD",
-        "generate columns of 1D cells"
+        "Create region mesh by extruding a faceZone"
     );
 
     #include "addRegionOption.H"
@@ -966,19 +929,34 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createNamedMesh.H"
-    const word oldInstance = mesh.pointsInstance();
 
-    word shellRegionName = args.additionalArgs()[0];
-    const wordList zoneNames(IStringStream(args.additionalArgs()[1])());
-    scalar thickness = readScalar(IStringStream(args.additionalArgs()[2])());
+    const word oldInstance = mesh.pointsInstance();
     bool overwrite = args.optionFound("overwrite");
-    bool oneD = args.optionFound("oneD");
+
+    IOdictionary dict
+    (
+        IOobject
+        (
+            "extrudeToRegionMeshDict",
+            runTime.system(),
+            runTime,
+            IOobject::MUST_READ_IF_MODIFIED
+        )
+    );
+
+    // Point generator
+    autoPtr<extrudeModel> model(extrudeModel::New(dict));
+
+
+    // Region
+    const word shellRegionName(dict.lookup("region"));
+    const wordList zoneNames(dict.lookup("faceZones"));
+    const Switch oneD(dict.lookup("oneD"));
 
 
     Info<< "Extruding zones " << zoneNames
         << " on mesh " << regionName
         << " into shell mesh " << shellRegionName
-        << " of thickness " << thickness << nl
         << endl;
 
     if (shellRegionName == regionName)
@@ -1081,7 +1059,6 @@ int main(int argc, char *argv[])
     );
 
 
-
     // Check whether the zone is internal or external faces to determine
     // what patch type to insert. Cannot be mixed
     // since then how to couple? - directMapped only valid for a whole patch.
@@ -1437,6 +1414,8 @@ int main(int argc, char *argv[])
     // Calculate a normal per region
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     vectorField regionNormals(regionPoints.size(), vector::zero);
+    vectorField regionCentres(regionPoints.size(), vector::zero);
+    labelList nRegionFaces(regionPoints.size(), 0);
 
     forAll(pointRegions, faceI)
     {
@@ -1446,9 +1425,15 @@ int main(int argc, char *argv[])
         {
             label region = pointRegions[faceI][fp];
             regionNormals[region] += extrudePatch.faceNormals()[faceI];
+            regionCentres[region] += extrudePatch.faceCentres()[faceI];
+            nRegionFaces[region]++;
         }
     }
     regionNormals /= mag(regionNormals);
+    forAll(regionCentres, regionI)
+    {
+        regionCentres[regionI] /= nRegionFaces[regionI];
+    }
 
 
     // Constrain&sync normals on points that are on coupled patches.
@@ -1463,10 +1448,13 @@ int main(int argc, char *argv[])
     );
 
     // For debugging: dump hedgehog plot of normals
+    if (false)
     {
         OFstream str(runTime.path()/"regionNormals.obj");
         label vertI = 0;
 
+        scalar thickness = model().sumThickness(1);
+
         forAll(pointRegions, faceI)
         {
             const face& f = extrudeFaces[faceI];
@@ -1486,6 +1474,16 @@ int main(int argc, char *argv[])
     }
 
 
+    // Use model to create displacements of first layer
+    vectorField firstDisp(regionNormals.size());
+    forAll(firstDisp, regionI)
+    {
+        const point& regionPt = regionCentres[regionI];
+        const vector& n = regionNormals[regionI];
+        firstDisp[regionI] = model()(regionPt, n, 1) - regionPt;
+    }
+
+
 
     // Create a new mesh
     // ~~~~~~~~~~~~~~~~~
@@ -1500,7 +1498,9 @@ int main(int argc, char *argv[])
 
         extruder.setRefinement
         (
-            thickness*regionNormals,
+            firstDisp,                              // first displacement
+            model().expansionRatio(),
+            model().nLayers(),                      // nLayers
             extrudeTopPatchID,
             extrudeBottomPatchID,
             extrudeEdgePatches,
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict
new file mode 100644
index 0000000000..6f6fc40f17
--- /dev/null
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict
@@ -0,0 +1,78 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      extrudeToRegionMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Name of region to create
+region  liquidFilm;
+
+// faceZones to extrude
+faceZones (f0);
+
+// Extrude 1D-columns of cells?
+oneD false;
+
+//- Extrusion model to use. The only logical choice is linearNormal?
+
+//- Linear extrusion in normal direction
+extrudeModel        linearNormal;
+
+//- Linear extrusion in specified direction
+//extrudeModel        linearDirection;
+
+//- Wedge extrusion. If nLayers is 1 assumes symmetry around plane.
+// extrudeModel        wedge;
+
+//- Extrudes into sphere around (0 0 0)
+//extrudeModel        linearRadial;
+
+//- Extrudes into sphere with grading according to pressure (atmospherics)
+//extrudeModel        sigmaRadial;
+
+nLayers             10;
+
+expansionRatio      0.9;
+
+linearNormalCoeffs
+{
+    thickness       0.05;
+}
+
+wedgeCoeffs
+{
+    axisPt      (0 0.1 -0.05);
+    axis        (-1 0 0);
+    angle       360;  // For nLayers=1 assume symmetry so angle/2 on each side
+}
+
+linearDirectionCoeffs
+{
+    direction       (0 1 0);
+    thickness       0.05;
+}
+
+linearRadialCoeffs
+{
+     R              0.1;
+}
+
+sigmaRadialCoeffs
+{
+    RTbyg           1;
+    pRef            1;
+    pStrat          1;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/patchPointEdgeCirculator.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.C
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/patchPointEdgeCirculator.C
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.H b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/patchPointEdgeCirculator.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculator.H
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/patchPointEdgeCirculator.H
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculatorI.H b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/patchPointEdgeCirculatorI.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculatorI.H
rename to applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/patchPointEdgeCirculatorI.H
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 7f80d01e5d..0e1631e776 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -55,23 +55,6 @@ namespace Foam
     defineTemplateTypeNameAndDebug(IOPtrList<dictionary>, 0);
 }
 
-// Combine operator to synchronise points. We choose point nearest to origin so
-// we can use e.g. great,great,great as null value.
-class nearestEqOp
-{
-
-public:
-
-    void operator()(vector& x, const vector& y) const
-    {
-        if (magSqr(y) < magSqr(x))
-        {
-            x = y;
-        }
-    }
-};
-
-
 void changePatchID
 (
     const polyMesh& mesh,
@@ -854,7 +837,7 @@ int main(int argc, char *argv[])
         (
             mesh,
             newPoints,
-            nearestEqOp(),
+            minMagSqrEqOp<vector>(),
             point(GREAT, GREAT, GREAT)
         );
 
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
index b870e9efab..f51ebafb87 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
@@ -561,10 +561,6 @@ int main(int argc, char *argv[])
         mkDir(args.path());
     }
 
-    // Switch timeStamp checking to one which does not do any
-    // parallel sync for same reason
-    regIOobject::fileModificationChecking = regIOobject::timeStamp;
-
 #   include "createTime.H"
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
index 26d8b065c8..b36cf66ad4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
@@ -36,12 +36,12 @@ using namespace Foam;
 template<class Type>
 void ensightCloudField
 (
-    const Foam::IOobject& fieldObject,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
-    const Foam::word& cloudName,
-    Foam::Ostream& ensightCaseFile,
+    const IOobject& fieldObject,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
+    const word& cloudName,
+    Ostream& ensightCaseFile,
     const bool dataExists
 )
 {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H
index 376e537037..8a624c11ee 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H
@@ -42,13 +42,13 @@ SourceFiles
 template<class Type>
 void ensightCloudField
 (
-    const Foam::IOobject& fieldObject,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
-    const Foam::word& timeFile,
-    const Foam::word& cloudName,
-    Foam::Ostream& ensightCaseFile,
+    const IOobject& fieldObject,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
+    const word& timeFile,
+    const word& cloudName,
+    Ostream& ensightCaseFile,
     const bool dataExists
 );
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index 5434209711..b9cb04b0d6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -105,11 +105,11 @@ void writeField
 template<class Type>
 bool writePatchField
 (
-    const Foam::Field<Type>& pf,
-    const Foam::label patchi,
-    const Foam::label ensightPatchI,
-    const Foam::faceSets& boundaryFaceSet,
-    const Foam::ensightMesh::nFacePrimitives& nfp,
+    const Field<Type>& pf,
+    const label patchi,
+    const label ensightPatchI,
+    const faceSets& boundaryFaceSet,
+    const ensightMesh::nFacePrimitives& nfp,
     ensightStream& ensightFile
 )
 {
@@ -153,15 +153,15 @@ bool writePatchField
 template<class Type>
 void writePatchField
 (
-    const Foam::word& fieldName,
-    const Foam::Field<Type>& pf,
-    const Foam::word& patchName,
-    const Foam::ensightMesh& eMesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
+    const word& fieldName,
+    const Field<Type>& pf,
+    const word& patchName,
+    const ensightMesh& eMesh,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
     const bool binary,
-    Foam::Ostream& ensightCaseFile
+    Ostream& ensightCaseFile
 )
 {
     const Time& runTime = eMesh.mesh().time();
@@ -271,12 +271,12 @@ template<class Type>
 void ensightField
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
-    const Foam::ensightMesh& eMesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
+    const ensightMesh& eMesh,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
     const bool binary,
-    Foam::Ostream& ensightCaseFile
+    Ostream& ensightCaseFile
 )
 {
     Info<< "Converting field " << vf.name() << endl;
@@ -500,12 +500,12 @@ template<class Type>
 void ensightPointField
 (
     const GeometricField<Type, pointPatchField, pointMesh>& pf,
-    const Foam::ensightMesh& eMesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
+    const ensightMesh& eMesh,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
     const bool binary,
-    Foam::Ostream& ensightCaseFile
+    Ostream& ensightCaseFile
 )
 {
     Info<< "Converting field " << pf.name() << endl;
@@ -679,14 +679,14 @@ void ensightPointField
 template<class Type>
 void ensightField
 (
-    const Foam::IOobject& fieldObject,
-    const Foam::ensightMesh& eMesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& prepend,
-    const Foam::label timeIndex,
+    const IOobject& fieldObject,
+    const ensightMesh& eMesh,
+    const fileName& postProcPath,
+    const word& prepend,
+    const label timeIndex,
     const bool binary,
     const bool nodeValues,
-    Foam::Ostream& ensightCaseFile
+    Ostream& ensightCaseFile
 )
 {
     // Read field
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C
index 20bb59b72a..bd23d234a4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C
@@ -37,10 +37,10 @@ using namespace Foam;
 
 void ensightParticlePositions
 (
-    const Foam::fvMesh& mesh,
-    const Foam::fileName& postProcPath,
-    const Foam::word& timeFile,
-    const Foam::word& cloudName,
+    const fvMesh& mesh,
+    const fileName& postProcPath,
+    const word& timeFile,
+    const word& cloudName,
     const bool dataExists
 )
 {
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 577f1470ae..85593d457f 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
     // write bounding box corners
     if (args.optionFound("blockMesh"))
     {
-        pointField cornerPts = boundBox(surf.points()).corners();
+        pointField cornerPts = boundBox(surf.points()).points();
 
         Info<<"// blockMeshDict info" << nl;
 
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index f72bcb6e5e..2b8183295f 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -33,9 +33,6 @@ Description
 
 #include "argList.H"
 #include "ListOps.H"
-#include "face.H"
-#include "tetPointRef.H"
-#include "triFaceList.H"
 #include "triSurface.H"
 #include "OFstream.H"
 #include "meshTools.H"
@@ -43,242 +40,12 @@ Description
 #include "transform.H"
 #include "IOmanip.H"
 #include "Pair.H"
+#include "momentOfInertia.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 using namespace Foam;
 
-void massPropertiesSolid
-(
-    const pointField& pts,
-    const triFaceList& triFaces,
-    scalar density,
-    scalar& mass,
-    vector& cM,
-    tensor& J
-)
-{
-    // Reimplemented from: Wm4PolyhedralMassProperties.cpp
-    // File Version: 4.10.0 (2009/11/18)
-
-    // Geometric Tools, LC
-    // Copyright (c) 1998-2010
-    // Distributed under the Boost Software License, Version 1.0.
-    // http://www.boost.org/LICENSE_1_0.txt
-    // http://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-
-    // Boost Software License - Version 1.0 - August 17th, 2003
-
-    // Permission is hereby granted, free of charge, to any person or
-    // organization obtaining a copy of the software and accompanying
-    // documentation covered by this license (the "Software") to use,
-    // reproduce, display, distribute, execute, and transmit the
-    // Software, and to prepare derivative works of the Software, and
-    // to permit third-parties to whom the Software is furnished to do
-    // so, all subject to the following:
-
-    // The copyright notices in the Software and this entire
-    // statement, including the above license grant, this restriction
-    // and the following disclaimer, must be included in all copies of
-    // the Software, in whole or in part, and all derivative works of
-    // the Software, unless such copies or derivative works are solely
-    // in the form of machine-executable object code generated by a
-    // source language processor.
-
-    // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-    // OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
-    // NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-    // ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR
-    // OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-    // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-    // USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    const scalar r6 = 1.0/6.0;
-    const scalar r24 = 1.0/24.0;
-    const scalar r60 = 1.0/60.0;
-    const scalar r120 = 1.0/120.0;
-
-    // order:  1, x, y, z, x^2, y^2, z^2, xy, yz, zx
-    scalarField integrals(10, 0.0);
-
-    forAll(triFaces, i)
-    {
-        const triFace& tri(triFaces[i]);
-
-        // vertices of triangle i
-        vector v0 = pts[tri[0]];
-        vector v1 = pts[tri[1]];
-        vector v2 = pts[tri[2]];
-
-        // cross product of edges
-        vector eA = v1 - v0;
-        vector eB = v2 - v0;
-        vector n = eA ^ eB;
-
-        // compute integral terms
-        scalar tmp0, tmp1, tmp2;
-
-        scalar f1x, f2x, f3x, g0x, g1x, g2x;
-
-        tmp0 = v0.x() + v1.x();
-        f1x = tmp0 + v2.x();
-        tmp1 = v0.x()*v0.x();
-        tmp2 = tmp1 + v1.x()*tmp0;
-        f2x = tmp2 + v2.x()*f1x;
-        f3x = v0.x()*tmp1 + v1.x()*tmp2 + v2.x()*f2x;
-        g0x = f2x + v0.x()*(f1x + v0.x());
-        g1x = f2x + v1.x()*(f1x + v1.x());
-        g2x = f2x + v2.x()*(f1x + v2.x());
-
-        scalar f1y, f2y, f3y, g0y, g1y, g2y;
-
-        tmp0 = v0.y() + v1.y();
-        f1y = tmp0 + v2.y();
-        tmp1 = v0.y()*v0.y();
-        tmp2 = tmp1 + v1.y()*tmp0;
-        f2y = tmp2 + v2.y()*f1y;
-        f3y = v0.y()*tmp1 + v1.y()*tmp2 + v2.y()*f2y;
-        g0y = f2y + v0.y()*(f1y + v0.y());
-        g1y = f2y + v1.y()*(f1y + v1.y());
-        g2y = f2y + v2.y()*(f1y + v2.y());
-
-        scalar f1z, f2z, f3z, g0z, g1z, g2z;
-
-        tmp0 = v0.z() + v1.z();
-        f1z = tmp0 + v2.z();
-        tmp1 = v0.z()*v0.z();
-        tmp2 = tmp1 + v1.z()*tmp0;
-        f2z = tmp2 + v2.z()*f1z;
-        f3z = v0.z()*tmp1 + v1.z()*tmp2 + v2.z()*f2z;
-        g0z = f2z + v0.z()*(f1z + v0.z());
-        g1z = f2z + v1.z()*(f1z + v1.z());
-        g2z = f2z + v2.z()*(f1z + v2.z());
-
-        // update integrals
-        integrals[0] += n.x()*f1x;
-        integrals[1] += n.x()*f2x;
-        integrals[2] += n.y()*f2y;
-        integrals[3] += n.z()*f2z;
-        integrals[4] += n.x()*f3x;
-        integrals[5] += n.y()*f3y;
-        integrals[6] += n.z()*f3z;
-        integrals[7] += n.x()*(v0.y()*g0x + v1.y()*g1x + v2.y()*g2x);
-        integrals[8] += n.y()*(v0.z()*g0y + v1.z()*g1y + v2.z()*g2y);
-        integrals[9] += n.z()*(v0.x()*g0z + v1.x()*g1z + v2.x()*g2z);
-    }
-
-    integrals[0] *= r6;
-    integrals[1] *= r24;
-    integrals[2] *= r24;
-    integrals[3] *= r24;
-    integrals[4] *= r60;
-    integrals[5] *= r60;
-    integrals[6] *= r60;
-    integrals[7] *= r120;
-    integrals[8] *= r120;
-    integrals[9] *= r120;
-
-    // mass
-    mass = integrals[0];
-
-    // center of mass
-    cM = vector(integrals[1], integrals[2], integrals[3])/mass;
-
-    // inertia relative to origin
-    J.xx() = integrals[5] + integrals[6];
-    J.xy() = -integrals[7];
-    J.xz() = -integrals[9];
-    J.yx() = J.xy();
-    J.yy() = integrals[4] + integrals[6];
-    J.yz() = -integrals[8];
-    J.zx() = J.xz();
-    J.zy() = J.yz();
-    J.zz() = integrals[4] + integrals[5];
-
-    // inertia relative to center of mass
-    J -= mass*((cM & cM)*I - cM*cM);
-
-    // Apply density
-    mass *= density;
-    J *= density;
-}
-
-
-void massPropertiesShell
-(
-    const pointField& pts,
-    const triFaceList& triFaces,
-    scalar density,
-    scalar& mass,
-    vector& cM,
-    tensor& J
-)
-{
-    // Reset properties for accumulation
-
-    mass = 0.0;
-    cM = vector::zero;
-    J = tensor::zero;
-
-    // Find centre of mass
-
-    forAll(triFaces, i)
-    {
-        const triFace& tri(triFaces[i]);
-
-        triPointRef t
-        (
-            pts[tri[0]],
-            pts[tri[1]],
-            pts[tri[2]]
-        );
-
-        scalar triMag = t.mag();
-
-        cM +=  triMag*t.centre();
-
-        mass += triMag;
-    }
-
-    cM /= mass;
-
-    mass *= density;
-
-    // Find inertia around centre of mass
-
-    forAll(triFaces, i)
-    {
-        const triFace& tri(triFaces[i]);
-
-        J += triPointRef
-        (
-            pts[tri[0]],
-            pts[tri[1]],
-            pts[tri[2]]
-        ).inertia(cM, density);
-    }
-}
-
-
-tensor applyParallelAxisTheorem
-(
-    scalar m,
-    const vector& cM,
-    const tensor& J,
-    const vector& refPt
-)
-{
-    // The displacement vector (refPt = cM) is the displacement of the
-    // new reference point from the centre of mass of the body that
-    // the inertia tensor applies to.
-
-    vector d = (refPt - cM);
-
-    return J + m*((d & d)*I - d*d);
-}
-
-
 int main(int argc, char *argv[])
 {
     argList::addNote
@@ -321,40 +88,17 @@ int main(int argc, char *argv[])
 
     triSurface surf(surfFileName);
 
-    triFaceList faces(surf.size());
-
-    forAll(surf, i)
-    {
-        faces[i] = triFace(surf[i]);
-    }
-
     scalar m = 0.0;
     vector cM = vector::zero;
     tensor J = tensor::zero;
 
     if (args.optionFound("shellProperties"))
     {
-        massPropertiesShell
-        (
-            surf.points(),
-            faces,
-            density,
-            m,
-            cM,
-            J
-        );
+        momentOfInertia::massPropertiesShell(surf, density, m, cM, J);
     }
     else
     {
-        massPropertiesSolid
-        (
-            surf.points(),
-            faces,
-            density,
-            m,
-            cM,
-            J
-        );
+        momentOfInertia::massPropertiesSolid(surf, density, m, cM, J);
     }
 
     if (m < 0)
@@ -583,7 +327,7 @@ int main(int argc, char *argv[])
         showTransform = false;
     }
 
-    Info<< nl << setprecision(10)
+    Info<< nl << setprecision(12)
         << "Density: " << density << nl
         << "Mass: " << m << nl
         << "Centre of mass: " << cM << nl
@@ -615,7 +359,7 @@ int main(int argc, char *argv[])
     if (calcAroundRefPt)
     {
         Info<< nl << "Inertia tensor relative to " << refPt << ": " << nl
-            << applyParallelAxisTheorem(m, cM, J, refPt)
+            << momentOfInertia::applyParallelAxisTheorem(m, cM, J, refPt)
             << endl;
     }
 
diff --git a/etc/controlDict b/etc/controlDict
index 32663f0873..df554111e0 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -593,6 +593,7 @@ DebugSwitches
     muSgsSpalartAllmarasWallFunction 0;
     multiDirRefinement  0;
     multiHoleInjector   0;
+    multiLevel          1;
     multivariateSelection 0;
     mutRoughWallFunction 0;
     mutSpalartAllmarasStandardRoughWallFunction  0;
diff --git a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
index 060666e02f..95539965ce 100644
--- a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
+++ b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
@@ -40,8 +40,7 @@ const Foam::scalar
 Foam::FaceCellWave<Type, TrackingData>::geomTol_ = 1e-6;
 
 template <class Type, class TrackingData>
-const Foam::scalar
-Foam::FaceCellWave<Type, TrackingData>::propagationTol_ = 0.01;
+Foam::scalar Foam::FaceCellWave<Type, TrackingData>::propagationTol_ = 0.01;
 
 template <class Type, class TrackingData>
 Foam::label Foam::FaceCellWave<Type, TrackingData>::dummyTrackData_ = 12345;
@@ -516,8 +515,8 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
                 refCast<const processorPolyPatch>(patch);
 
             // Allocate buffers
-            labelList receiveFaces(patch.size());
-            List<Type> receiveFacesInfo(patch.size());
+            labelList receiveFaces;
+            List<Type> receiveFacesInfo;
 
             {
                 UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs);
@@ -675,8 +674,7 @@ Foam::FaceCellWave<Type, TrackingData>::FaceCellWave
     hasCyclicPatches_(hasCyclicPatch()),
     nEvals_(0),
     nUnvisitedCells_(mesh_.nCells()),
-    nUnvisitedFaces_(mesh_.nFaces()),
-    iter_(0)
+    nUnvisitedFaces_(mesh_.nFaces())
 {}
 
 
@@ -707,16 +705,15 @@ Foam::FaceCellWave<Type, TrackingData>::FaceCellWave
     hasCyclicPatches_(hasCyclicPatch()),
     nEvals_(0),
     nUnvisitedCells_(mesh_.nCells()),
-    nUnvisitedFaces_(mesh_.nFaces()),
-    iter_(0)
+    nUnvisitedFaces_(mesh_.nFaces())
 {
     // Copy initial changed faces data
     setFaceInfo(changedFaces, changedFacesInfo);
 
     // Iterate until nothing changes
-    iterate(maxIter);
+    label iter = iterate(maxIter);
 
-    if ((maxIter > 0) && (iter_ >= maxIter))
+    if ((maxIter > 0) && (iter >= maxIter))
     {
         FatalErrorIn
         (
@@ -796,7 +793,7 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::faceToCell()
             );
         }
 
-        // Neighbour. Hack for check if face has neighbour.
+        // Neighbour.
         if (faceI < nInternalFaces)
         {
             cellI = neighbour[faceI];
@@ -927,11 +924,13 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::iterate(const label maxIter)
         handleProcPatches();
     }
 
-    while (iter_ < maxIter)
+    label iter = 0;
+
+    while (iter < maxIter)
     {
         if (debug)
         {
-            Pout<< " Iteration " << iter_ << endl;
+            Pout<< " Iteration " << iter << endl;
         }
 
         nEvals_ = 0;
@@ -963,10 +962,11 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::iterate(const label maxIter)
             break;
         }
 
-        ++iter_;
+        ++iter;
     }
 
-    return nUnvisitedCells_;
+    return iter;
 }
 
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
index 6ad8a1ae32..2824d8e13a 100644
--- a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
+++ b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
@@ -114,9 +114,6 @@ class FaceCellWave
         label nUnvisitedCells_;
         label nUnvisitedFaces_;
 
-        //- Iteration counter
-        label iter_;
-
 
     // Private Member Functions
 
@@ -232,7 +229,7 @@ class FaceCellWave
       // Private static data
 
             static const scalar geomTol_;
-            static const scalar propagationTol_;
+            static scalar propagationTol_;
 
             //- Used as default trackdata value to satisfy default template
             //  argument.
@@ -340,8 +337,8 @@ public:
             //  counted double)
             label cellToFace();
 
-            //- Iterate until no changes or maxIter reached. Returns number of
-            //  unset cells (see getUnsetCells)
+            //- Iterate until no changes or maxIter reached.  Returns actual
+            //  number of iterations.
             label iterate(const label maxIter);
 
 };
diff --git a/src/OpenFOAM/algorithms/MeshWave/MeshWave.H b/src/OpenFOAM/algorithms/MeshWave/MeshWave.H
index a93d01cfab..d48f3c69aa 100644
--- a/src/OpenFOAM/algorithms/MeshWave/MeshWave.H
+++ b/src/OpenFOAM/algorithms/MeshWave/MeshWave.H
@@ -134,8 +134,8 @@ public:
             return calc_.data();
         }
 
-        //- Iterate until no changes or maxIter reached. Returns number of
-        //  unset cells (see getUnsetCells)
+        //- Iterate until no changes or maxIter reached. Returns actual
+        //  number of iterations.
         label iterate(const label maxIter)
         {
             return calc_.iterate(maxIter);
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
index 65276015fe..a1d6903956 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
@@ -66,6 +66,10 @@ void Foam::IOdictionary::readFile(const bool masterOnly)
           : Pstream::treeCommunication()
         );
 
+        // Master reads headerclassname from file. Make sure this gets
+        // transfered as well as contents.
+        Pstream::scatter(comms, const_cast<word&>(headerClassName()));
+        Pstream::scatter(comms, note());
 
         // Get my communication order
         const Pstream::commsStruct& myComm = comms[Pstream::myProcNo()];
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
index fcf53b985f..3ba675fe2c 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
@@ -201,6 +201,11 @@ bool Foam::regIOobject::read()
           : Pstream::treeCommunication()
         );
 
+        // Master reads headerclassname from file. Make sure this gets
+        // transfered as well as contents.
+        Pstream::scatter(comms, const_cast<word&>(headerClassName()));
+        Pstream::scatter(comms, note());
+
 
         // Get my communication order
         const Pstream::commsStruct& myComm = comms[Pstream::myProcNo()];
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
index 6699b6349b..be8a2b71ba 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
@@ -284,10 +284,8 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
             case interpolationTable::REPEAT:
             {
                 // adjust lookupValue to >= minLimit
-                while (lookupValue < minLimit)
-                {
-                    lookupValue += maxLimit;
-                }
+                scalar span = maxLimit-minLimit;
+                lookupValue = fmod(lookupValue-minLimit, span) + minLimit;
                 break;
             }
         }
@@ -325,10 +323,8 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
             case interpolationTable::REPEAT:
             {
                 // adjust lookupValue <= maxLimit
-                while (lookupValue > maxLimit)
-                {
-                    lookupValue -= maxLimit;
-                }
+                scalar span = maxLimit-minLimit;
+                lookupValue = fmod(lookupValue-minLimit, span) + minLimit;
                 break;
             }
         }
@@ -540,11 +536,9 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
             }
             case interpolationTable::REPEAT:
             {
-                // adjust lookupValue to >= minLimin
-                while (lookupValue < minLimit)
-                {
-                    lookupValue += maxLimit;
-                }
+                // adjust lookupValue to >= minLimit
+                scalar span = maxLimit-minLimit;
+                lookupValue = fmod(lookupValue-minLimit, span) + minLimit;
                 break;
             }
         }
@@ -582,10 +576,8 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
             case interpolationTable::REPEAT:
             {
                 // adjust lookupValue <= maxLimit
-                while (lookupValue > maxLimit)
-                {
-                    lookupValue -= maxLimit;
-                }
+                scalar span = maxLimit-minLimit;
+                lookupValue = fmod(lookupValue-minLimit, span) + minLimit;
                 break;
             }
         }
diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index 610df5b8dd..c24ed33a60 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -84,7 +84,11 @@ Foam::solution::solution
             dictName,
             obr.time().system(),
             obr,
-            IOobject::MUST_READ_IF_MODIFIED,
+            (
+                obr.readOpt() == IOobject::MUST_READ
+              ? IOobject::MUST_READ_IF_MODIFIED
+              : obr.readOpt()
+            ),
             IOobject::NO_WRITE
         )
     ),
@@ -94,7 +98,14 @@ Foam::solution::solution
     defaultRelaxationFactor_(0),
     solvers_(ITstream("solvers", tokenList())())
 {
-    read(solutionDict());
+    if
+    (
+        readOpt() == IOobject::MUST_READ
+     || readOpt() == IOobject::MUST_READ_IF_MODIFIED
+    )
+    {
+        read(solutionDict());
+    }
 }
 
 
diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.C b/src/OpenFOAM/meshes/boundBox/boundBox.C
index 74061716c2..279412ab4d 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBox.C
+++ b/src/OpenFOAM/meshes/boundBox/boundBox.C
@@ -111,7 +111,7 @@ Foam::boundBox::boundBox(Istream& is)
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::pointField> Foam::boundBox::corners() const
+Foam::tmp<Foam::pointField> Foam::boundBox::points() const
 {
     tmp<pointField> tPts = tmp<pointField>(new pointField(8));
     pointField& pt = tPts();
diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.H b/src/OpenFOAM/meshes/boundBox/boundBox.H
index 2f510bc9e7..0c110b8509 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBox.H
+++ b/src/OpenFOAM/meshes/boundBox/boundBox.H
@@ -177,7 +177,7 @@ public:
             }
 
             //- Return corner points in an order corresponding to a 'hex' cell
-            tmp<pointField> corners() const;
+            tmp<pointField> points() const;
 
         // Query
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/tetIndices.H b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/tetIndices.H
index 3e5ee425d6..3a7513770d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/tetIndices.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/tetIndices.H
@@ -41,6 +41,7 @@ SourceFiles
 #include "tetPointRef.H"
 #include "triPointRef.H"
 #include "polyMesh.H"
+#include "triFace.H"
 #include "face.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -146,6 +147,10 @@ public:
             //  mesh face for this tet from the supplied mesh
             inline triPointRef faceTri(const polyMesh& mesh) const;
 
+            //- Return the point indices corresponding to the tri on the mesh
+            //  face for this tet from the supplied mesh
+            inline triFace faceTriIs(const polyMesh& mesh) const;
+
             //- Return the geometry corresponding to the tri on the
             //  mesh face for this tet from the supplied mesh using
             //  the old position
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/tetIndicesI.H b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/tetIndicesI.H
index 6b8a7871a0..9a4287b5c4 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/tetIndicesI.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/tetIndicesI.H
@@ -122,6 +122,21 @@ Foam::triPointRef Foam::tetIndices::faceTri(const polyMesh& mesh) const
 }
 
 
+Foam::triFace Foam::tetIndices::faceTriIs(const polyMesh& mesh) const
+{
+    const faceList& pFaces = mesh.faces();
+
+    const Foam::face& f = pFaces[faceI_];
+
+    return triFace
+    (
+        f[faceBasePtI_],
+        f[facePtAI_],
+        f[facePtBI_]
+    );
+}
+
+
 Foam::triPointRef Foam::tetIndices::oldFaceTri(const polyMesh& mesh) const
 {
     const pointField& oldPPts = mesh.oldPoints();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index e7d1991fb9..0010c5ecc4 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -273,6 +273,30 @@ void Foam::cyclicPolyPatch::calcTransforms
             half1Normals,
             half0Tols
         );
+
+        if (transform_ == ROTATIONAL && !parallel() && forwardT().size() > 1)
+        {
+            const_cast<tensorField&>(forwardT()).setSize(1);
+            const_cast<tensorField&>(reverseT()).setSize(1);
+            const_cast<boolList&>(collocated()).setSize(1);
+
+            WarningIn
+            (
+                "cyclicPolyPatch::calcTransforms\n"
+                "    (\n"
+                "        const primitivePatch&,\n"
+                "        const UList<point>&,\n"
+                "        const UList<point>&,\n"
+                "        const UList<point>&,\n"
+                "        const UList<point>&\n"
+                "    )"
+            )   << "For patch " << name()
+                << " calculated non-uniform transform tensor even though"
+                << " the transform type is " << transformTypeNames[transform_]
+                << ". Setting the transformation tensor to be a uniform"
+                << " rotation."
+                << endl;
+        }
     }
 }
 
@@ -851,22 +875,6 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledPoints() const
                 str<< "l " << vertI-1 << ' ' << vertI << nl;
             }
         }
-
-        // Remove any addressing calculated for the coupled edges calculation
-        const_cast<primitivePatch&>
-        (
-            static_cast<const primitivePatch&>
-            (
-                *this
-            )
-        ).clearOut();
-        const_cast<primitivePatch&>
-        (
-            static_cast<const primitivePatch&>
-            (
-                neighbPatch()
-            )
-        ).clearOut();
     }
     return *coupledPointsPtr_;
 }
@@ -1006,22 +1014,6 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
                 str<< "l " << vertI-1 << ' ' << vertI << nl;
             }
         }
-
-        // Remove any addressing calculated for the coupled edges calculation
-        const_cast<primitivePatch&>
-        (
-            static_cast<const primitivePatch&>
-            (
-                *this
-            )
-        ).clearOut();
-        const_cast<primitivePatch&>
-        (
-            static_cast<const primitivePatch&>
-            (
-                neighbPatch
-            )
-        ).clearOut();
     }
     return *coupledEdgesPtr_;
 }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index cd913267af..47425f1a8c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -409,6 +409,7 @@ void Foam::processorPolyPatch::updateMesh(PstreamBuffers& pBufs)
         }
 
         // Remove any addressing used for shared points/edges calculation
+        // since mostly not needed.
         primitivePatch::clearOut();
     }
 }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
index 6bc517ec25..33264fc0d3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
@@ -174,8 +174,6 @@ void Foam::processorCyclicPolyPatch::calcGeometry(PstreamBuffers& pBufs)
         // Update underlying cyclic
         coupledPolyPatch& pp = const_cast<coupledPolyPatch&>(referPatch());
 
-        Pout<< "updating geometry on refered patch:" << pp.name() << endl;
-
         pp.calcGeometry
         (
             *this,
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
index 3a670f39a4..46a3adaea7 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
@@ -156,29 +156,12 @@ inline Point tetrahedron<Point, PointRef>::circumCentre() const
 
     if (Foam::mag(denom) < ROOTVSMALL)
     {
-        // Degenerate tet. Use test of the individual triangles.
-        {
-            point triCentre = triPointRef(a_, b_, c_).circumCentre();
-            if (magSqr(d_ - triCentre) < magSqr(a_ - triCentre))
-            {
-                return triCentre;
-            }
-        }
-        {
-            point triCentre = triPointRef(a_, b_, d_).circumCentre();
-            if (magSqr(c_ - triCentre) < magSqr(a_ - triCentre))
-            {
-                return triCentre;
-            }
-        }
-        {
-            point triCentre = triPointRef(a_, c_, d_).circumCentre();
-            if (magSqr(b_ - triCentre) < magSqr(a_ - triCentre))
-            {
-                return triCentre;
-            }
-        }
-        return triPointRef(b_, c_, d_).circumCentre();
+        WarningIn("Point tetrahedron<Point, PointRef>::circumCentre() const")
+            << "Degenerate tetrahedron:" << nl << *this << nl
+            <<"Returning centre instead of circumCentre."
+            << endl;
+
+        return centre();
     }
 
     return a_ + 0.5*(a + num/denom);
@@ -188,16 +171,43 @@ inline Point tetrahedron<Point, PointRef>::circumCentre() const
 template<class Point, class PointRef>
 inline scalar tetrahedron<Point, PointRef>::circumRadius() const
 {
-    return Foam::mag(a_ - circumCentre());
+    vector a = b_ - a_;
+    vector b = c_ - a_;
+    vector c = d_ - a_;
+
+    scalar lambda = magSqr(c) - (a & c);
+    scalar mu = magSqr(b) - (a & b);
+
+    vector ba = b ^ a;
+    vector ca = c ^ a;
+
+    vector num = lambda*ba - mu*ca;
+    scalar denom = (c & ba);
+
+    if (Foam::mag(denom) < ROOTVSMALL)
+    {
+        WarningIn("Point tetrahedron<Point, PointRef>::circumCentre() const")
+            << "Degenerate tetrahedron:" << nl << *this << nl
+            << "Returning GREAT for circumRadius."
+            << endl;
+
+        return GREAT;
+    }
+
+    return Foam::mag(0.5*(a + num/denom));
 }
 
 
 template<class Point, class PointRef>
 inline scalar tetrahedron<Point, PointRef>::quality() const
 {
-    // Note: 8/(9*sqrt(3)) = 0.5132002393
-
-    return mag()/(0.5132002393*pow3(min(circumRadius(), GREAT)) + ROOTVSMALL);
+    return
+        mag()
+       /(
+            8.0/(9.0*sqrt(3.0))
+           *pow3(min(circumRadius(), GREAT))
+          + ROOTVSMALL
+        );
 }
 
 
@@ -266,7 +276,8 @@ scalar tetrahedron<Point, PointRef>::barycentric
                 "const point& pt"
             ") const"
         )
-            << "Degenerate tetrahedron - returning 1/4 barycentric coordinates."
+            << "Degenerate tetrahedron:" << nl << *this << nl
+            << "Returning 1/4 barycentric coordinates."
             << endl;
 
         bary = List<scalar>(4, 0.25);
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
index 7840d8ee7b..b99ba990cd 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
@@ -109,9 +109,9 @@ inline vector triangle<Point, PointRef>::normal() const
 template<class Point, class PointRef>
 inline Point triangle<Point, PointRef>::circumCentre() const
 {
-    scalar d1 = (c_ - a_)&(b_ - a_);
-    scalar d2 = -(c_ - b_)&(b_ - a_);
-    scalar d3 = (c_ - a_)&(c_ - b_);
+    scalar d1 =  (c_ - a_) & (b_ - a_);
+    scalar d2 = -(c_ - b_) & (b_ - a_);
+    scalar d3 =  (c_ - a_) & (c_ - b_);
 
     scalar c1 = d2*d3;
     scalar c2 = d3*d1;
@@ -119,6 +119,16 @@ inline Point triangle<Point, PointRef>::circumCentre() const
 
     scalar c = c1 + c2 + c3;
 
+    if (Foam::mag(c) < ROOTVSMALL)
+    {
+        WarningIn("Point triangle<Point, PointRef>::circumCentre() const")
+            << "Degenerate triangle:" << nl << *this << nl
+            << "Returning centre instead of circumCentre."
+            << endl;
+
+        return centre();
+    }
+
     return
     (
         ((c2 + c3)*a_ + (c3 + c1)*b_ + (c1 + c2)*c_)/(2*c)
@@ -129,14 +139,19 @@ inline Point triangle<Point, PointRef>::circumCentre() const
 template<class Point, class PointRef>
 inline scalar triangle<Point, PointRef>::circumRadius() const
 {
-    scalar d1 = (c_ - a_) & (b_ - a_);
-    scalar d2 = - (c_ - b_) & (b_ - a_);
-    scalar d3 = (c_ - a_) & (c_ - b_);
+    scalar d1 =  (c_ - a_) & (b_ - a_);
+    scalar d2 = -(c_ - b_) & (b_ - a_);
+    scalar d3 =  (c_ - a_) & (c_ - b_);
 
     scalar denom = d2*d3 + d3*d1 + d1*d2;
 
     if (Foam::mag(denom) < VSMALL)
     {
+        WarningIn("scalar triangle<Point, PointRef>::circumRadius() const")
+            << "Degenerate triangle:" << nl << *this << nl
+            << "Returning GREAT for circumRadius."
+            << endl;
+
         return GREAT;
     }
     else
@@ -151,16 +166,7 @@ inline scalar triangle<Point, PointRef>::circumRadius() const
 template<class Point, class PointRef>
 inline scalar triangle<Point, PointRef>::quality() const
 {
-    // Note: 3*sqr(3)/(4*pi) = 0.4134966716
-
-    return
-        mag()
-      / (
-            constant::mathematical::pi
-           *Foam::sqr(circumRadius())
-           *0.4134966716
-          + VSMALL
-        );
+    return mag()/(Foam::sqr(circumRadius())*3.0*sqrt(3.0)/4.0 + VSMALL);
 }
 
 
@@ -264,7 +270,8 @@ scalar triangle<Point, PointRef>::barycentric
                 "const point& pt"
             ") const"
         )
-            << "Degenerate triangle - returning 1/3 barycentric coordinates."
+            << "Degenerate triangle:" << nl << *this << nl
+            << "Returning 1/3 barycentric coordinates."
             << endl;
 
         bary = List<scalar>(3, 1.0/3.0);
@@ -490,7 +497,7 @@ pointHit triangle<Point, PointRef>::nearestPointClassify
 ) const
 {
     // Adapted from:
-    // Real-time collision detection, Christer Ericson, 2005, 136-142
+    // Real-time collision detection, Christer Ericson, 2005, p136-142
 
     // Check if P in vertex region outside A
     vector ab = b_ - a_;
@@ -528,6 +535,27 @@ pointHit triangle<Point, PointRef>::nearestPointClassify
 
     if (vc <= 0.0 && d1 >= 0.0 && d3 <= 0.0)
     {
+        if ((d1 - d3) < ROOTVSMALL)
+        {
+            WarningIn
+            (
+                "pointHit triangle<Point, PointRef>::nearestPointClassify"
+                "("
+                    "const point& p,"
+                    "label& nearType,"
+                    "label& nearLabel"
+                ") const"
+            )
+                << "Degenerate triangle:" << nl << *this << nl
+                << "d1, d3: " << d1 << ", " << d3 << endl;
+
+            // For d1 = d3, a_ and b_ are likely coincident.
+
+            nearType = POINT;
+            nearLabel = 0;
+            return pointHit(false, a_, Foam::mag(a_ - p), true);
+        }
+
         // barycentric coordinates (1-v, v, 0)
         scalar v = d1/(d1 - d3);
 
@@ -556,6 +584,27 @@ pointHit triangle<Point, PointRef>::nearestPointClassify
 
     if (vb <= 0.0 && d2 >= 0.0 && d6 <= 0.0)
     {
+        if ((d2 - d6) < ROOTVSMALL)
+        {
+            WarningIn
+            (
+                "pointHit triangle<Point, PointRef>::nearestPointClassify"
+                "("
+                    "const point& p,"
+                    "label& nearType,"
+                    "label& nearLabel"
+                ") const"
+            )
+                << "Degenerate triangle:" << nl << *this << nl
+                << "d2, d6: " << d2 << ", " << d6 << endl;
+
+            // For d2 = d6, a_ and c_ are likely coincident.
+
+            nearType = POINT;
+            nearLabel = 0;
+            return pointHit(false, a_, Foam::mag(a_ - p), true);
+        }
+
         // barycentric coordinates (1-w, 0, w)
         scalar w = d2/(d2 - d6);
 
@@ -570,6 +619,28 @@ pointHit triangle<Point, PointRef>::nearestPointClassify
 
     if (va <= 0.0 && (d4 - d3) >= 0.0 && (d5 - d6) >= 0.0)
     {
+        if (((d4 - d3) + (d5 - d6)) < ROOTVSMALL)
+        {
+            WarningIn
+            (
+                "pointHit triangle<Point, PointRef>::nearestPointClassify"
+                "("
+                    "const point& p,"
+                    "label& nearType,"
+                    "label& nearLabel"
+                ") const"
+            )
+                << "Degenerate triangle:" << nl << *this << nl
+                << "(d4 - d3), (d6 - d5): " << (d4 - d3) << ", " << (d6 - d5)
+                << endl;
+
+            // For (d4 - d3) = (d6 - d5), b_ and c_ are likely coincident.
+
+            nearType = POINT;
+            nearLabel = 1;
+            return pointHit(false, b_, Foam::mag(b_ - p), true);
+        }
+
         // barycentric coordinates (0, 1-w, w)
         scalar w = (d4 - d3)/((d4 - d3) + (d5 - d6));
 
@@ -581,6 +652,28 @@ pointHit triangle<Point, PointRef>::nearestPointClassify
 
     // P inside face region. Compute Q through its barycentric
     // coordinates (u, v, w)
+
+    if ((va + vb + vc) < ROOTVSMALL)
+    {
+        WarningIn
+        (
+            "pointHit triangle<Point, PointRef>::nearestPointClassify"
+            "("
+                "const point& p,"
+                "label& nearType,"
+                "label& nearLabel"
+            ") const"
+        )
+            << "Degenerate triangle:" << nl << *this << nl
+            << "va, vb, vc: " << va << ", " << vb << ", " << vc
+            << endl;
+
+        point nearPt = centre();
+        nearType = NONE,
+        nearLabel = -1;
+        return pointHit(true, nearPt, Foam::mag(nearPt - p), false);
+    }
+
     scalar denom = 1.0/(va + vb + vc);
     scalar v = vb * denom;
     scalar w = vc * denom;
diff --git a/src/OpenFOAM/primitives/ops/ops.H b/src/OpenFOAM/primitives/ops/ops.H
index 217fe8db6e..42d16029d0 100644
--- a/src/OpenFOAM/primitives/ops/ops.H
+++ b/src/OpenFOAM/primitives/ops/ops.H
@@ -76,6 +76,8 @@ EqOp(eqMag, x = mag(y))
 EqOp(plusEqMagSqr, x += magSqr(y))
 EqOp(maxEq, x = max(x, y))
 EqOp(minEq, x = min(x, y))
+EqOp(minMagSqrEq, x = (magSqr(x)<=magSqr(y) ? x : y))
+EqOp(maxMagSqrEq, x = (magSqr(x)>=magSqr(y) ? x : y))
 EqOp(andEq, x = (x && y))
 EqOp(orEq, x  = (x || y))
 
diff --git a/src/OpenFOAM/primitives/transform/transform.H b/src/OpenFOAM/primitives/transform/transform.H
index 70e6821612..c880e05888 100644
--- a/src/OpenFOAM/primitives/transform/transform.H
+++ b/src/OpenFOAM/primitives/transform/transform.H
@@ -48,9 +48,11 @@ inline tensor rotationTensor
     const vector& n2
 )
 {
+    const scalar s = n1 & n2;
+    const vector n3 = n1 ^ n2;
     return
-        (n1 & n2)*I
-      + (1 - (n1 & n2))*sqr(n1 ^ n2)/(magSqr(n1 ^ n2) + VSMALL)
+        s*I
+      + (1 - s)*sqr(n3)/(magSqr(n3) + VSMALL)
       + (n2*n1 - n1*n2);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index cb18909469..209bd9cd92 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -163,21 +163,19 @@ tmp<scalarField> advectiveFvPatchField<Type>::advectionSpeed() const
     const surfaceScalarField& phi =
         this->db().objectRegistry::lookupObject<surfaceScalarField>(phiName_);
 
-    fvsPatchField<scalar> phip = this->patch().lookupPatchField
-    (
-        phiName_,
-        reinterpret_cast<const surfaceScalarField*>(0),
-        reinterpret_cast<const scalar*>(0)
-    );
+    fvsPatchField<scalar> phip =
+        this->patch().template lookupPatchField<surfaceScalarField, scalar>
+        (
+            phiName_
+        );
 
     if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
     {
-        const fvPatchScalarField& rhop = this->patch().lookupPatchField
-        (
-            rhoName_,
-            reinterpret_cast<const volScalarField*>(0),
-            reinterpret_cast<const scalar*>(0)
-        );
+        const fvPatchScalarField& rhop =
+            this->patch().template lookupPatchField<volScalarField, scalar>
+            (
+                rhoName_
+            );
 
         return phip/(rhop*this->patch().magSf());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index 9587c380f5..a1f08fd98a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -25,15 +25,10 @@ License
 
 #include "inletOutletFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-inletOutletFvPatchField<Type>::inletOutletFvPatchField
+Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -49,7 +44,7 @@ inletOutletFvPatchField<Type>::inletOutletFvPatchField
 
 
 template<class Type>
-inletOutletFvPatchField<Type>::inletOutletFvPatchField
+Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
 (
     const inletOutletFvPatchField<Type>& ptf,
     const fvPatch& p,
@@ -63,7 +58,7 @@ inletOutletFvPatchField<Type>::inletOutletFvPatchField
 
 
 template<class Type>
-inletOutletFvPatchField<Type>::inletOutletFvPatchField
+Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -93,7 +88,7 @@ inletOutletFvPatchField<Type>::inletOutletFvPatchField
 
 
 template<class Type>
-inletOutletFvPatchField<Type>::inletOutletFvPatchField
+Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
 (
     const inletOutletFvPatchField<Type>& ptf
 )
@@ -104,7 +99,7 @@ inletOutletFvPatchField<Type>::inletOutletFvPatchField
 
 
 template<class Type>
-inletOutletFvPatchField<Type>::inletOutletFvPatchField
+Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
 (
     const inletOutletFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -118,19 +113,18 @@ inletOutletFvPatchField<Type>::inletOutletFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void inletOutletFvPatchField<Type>::updateCoeffs()
+void Foam::inletOutletFvPatchField<Type>::updateCoeffs()
 {
     if (this->updated())
     {
         return;
     }
 
-    const Field<scalar>& phip = this->patch().lookupPatchField
-    (
-        phiName_,
-        reinterpret_cast<const surfaceScalarField*>(0),
-        reinterpret_cast<const scalar*>(0)
-    );
+    const Field<scalar>& phip =
+        this->patch().template lookupPatchField<surfaceScalarField, scalar>
+        (
+            phiName_
+        );
 
     this->valueFraction() = 1.0 - pos(phip);
 
@@ -139,7 +133,7 @@ void inletOutletFvPatchField<Type>::updateCoeffs()
 
 
 template<class Type>
-void inletOutletFvPatchField<Type>::write(Ostream& os) const
+void Foam::inletOutletFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     if (phiName_ != "phi")
@@ -154,7 +148,7 @@ void inletOutletFvPatchField<Type>::write(Ostream& os) const
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Type>
-void inletOutletFvPatchField<Type>::operator=
+void Foam::inletOutletFvPatchField<Type>::operator=
 (
     const fvPatchField<Type>& ptf
 )
@@ -167,8 +161,4 @@ void inletOutletFvPatchField<Type>::operator=
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
index 86e68a8aa4..fe8cd0017a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
@@ -56,6 +56,7 @@ protected:
 
     // Protected data
 
+        //- Name of flux field
         word phiName_;
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index bb9b907c74..858226bfe2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -25,21 +25,17 @@ License
 
 #include "outletInletFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-outletInletFvPatchField<Type>::outletInletFvPatchField
+Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
 )
 :
-    mixedFvPatchField<Type>(p, iF)
+    mixedFvPatchField<Type>(p, iF),
+    phiName_("phi")
 {
     this->refValue() = *this;
     this->refGrad() = pTraits<Type>::zero;
@@ -48,7 +44,7 @@ outletInletFvPatchField<Type>::outletInletFvPatchField
 
 
 template<class Type>
-outletInletFvPatchField<Type>::outletInletFvPatchField
+Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
 (
     const outletInletFvPatchField<Type>& ptf,
     const fvPatch& p,
@@ -56,19 +52,21 @@ outletInletFvPatchField<Type>::outletInletFvPatchField
     const fvPatchFieldMapper& mapper
 )
 :
-    mixedFvPatchField<Type>(ptf, p, iF, mapper)
+    mixedFvPatchField<Type>(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_)
 {}
 
 
 template<class Type>
-outletInletFvPatchField<Type>::outletInletFvPatchField
+Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
     const dictionary& dict
 )
 :
-    mixedFvPatchField<Type>(p, iF)
+    mixedFvPatchField<Type>(p, iF),
+    phiName_(dict.lookupOrDefault<word>("phi", "phi"))
 {
     this->refValue() = Field<Type>("outletValue", dict, p.size());
 
@@ -90,42 +88,43 @@ outletInletFvPatchField<Type>::outletInletFvPatchField
 
 
 template<class Type>
-outletInletFvPatchField<Type>::outletInletFvPatchField
+Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
 (
     const outletInletFvPatchField<Type>& ptf
 )
 :
-    mixedFvPatchField<Type>(ptf)
+    mixedFvPatchField<Type>(ptf),
+    phiName_(ptf.phiName_)
 {}
 
 
 template<class Type>
-outletInletFvPatchField<Type>::outletInletFvPatchField
+Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
 (
     const outletInletFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
 )
 :
-    mixedFvPatchField<Type>(ptf, iF)
+    mixedFvPatchField<Type>(ptf, iF),
+    phiName_(ptf.phiName_)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void outletInletFvPatchField<Type>::updateCoeffs()
+void Foam::outletInletFvPatchField<Type>::updateCoeffs()
 {
     if (this->updated())
     {
         return;
     }
 
-    const fvsPatchField<scalar>& phip = this->patch().lookupPatchField
-    (
-        "phi",
-        reinterpret_cast<const surfaceScalarField*>(0),
-        reinterpret_cast<const scalar*>(0)
-    );
+    const fvsPatchField<scalar>& phip =
+        this->patch().template lookupPatchField<surfaceScalarField, scalar>
+        (
+            phiName_
+        );
 
     this->valueFraction() = pos(phip);
 
@@ -134,16 +133,16 @@ void outletInletFvPatchField<Type>::updateCoeffs()
 
 
 template<class Type>
-void outletInletFvPatchField<Type>::write(Ostream& os) const
+void Foam::outletInletFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
+    if (phiName_ != "phi")
+    {
+        os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
+    }
     this->refValue().writeEntry("outletValue", os);
     this->writeEntry("value", os);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
index a6548229d3..3ba722fceb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
@@ -52,6 +52,14 @@ class outletInletFvPatchField
     public mixedFvPatchField<Type>
 {
 
+protected:
+
+    // Protected data
+
+        //- Name of flux field
+        word phiName_;
+
+
 public:
 
     //- Runtime type information
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.C
index 15566adf44..4aaf6e8535 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,6 @@ selfContainedDirectMappedFixedValueFvPatchField
 {}
 
 
-
 template<class Type>
 selfContainedDirectMappedFixedValueFvPatchField<Type>::
 selfContainedDirectMappedFixedValueFvPatchField
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.H
index 0d76fb6d02..39137bf2c7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-              Class selfContainedDirectMappedFixedValueFvPatch Declaration
+      Class selfContainedDirectMappedFixedValueFvPatchField Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
@@ -75,6 +75,7 @@ class selfContainedDirectMappedFixedValueFvPatchField
 
         mutable autoPtr<interpolation<Type> > interpolator_;
 
+
     // Private Member Functions
 
         //- Field to sample. Either on my or nbr mesh
@@ -83,6 +84,7 @@ class selfContainedDirectMappedFixedValueFvPatchField
         //- Access the interpolation method
         const interpolation<Type>& interpolator() const;
 
+
 public:
 
     //- Runtime type information
@@ -186,6 +188,7 @@ public:
             //- Update the coefficients associated with the patch field
             virtual void updateCoeffs();
 
+
         //- Write
         virtual void write(Ostream&) const;
 };
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchFields.C
index 4338386527..94e0bc738d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchFields.H
index 9eb1154c2d..de8e960439 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchFields.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchFieldsFwd.H
index f284fc3bd7..1c487460cd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchFieldsFwd.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchFieldsFwd.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
index 477bb6f22c..4dc85d5e9b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
@@ -31,15 +31,10 @@ License
 #include "CrankNicholsonDdtScheme.H"
 #include "backwardDdtScheme.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
+Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -52,7 +47,7 @@ waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 
 
 template<class Type>
-waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
+Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 (
     const waveTransmissiveFvPatchField& ptf,
     const fvPatch& p,
@@ -67,7 +62,7 @@ waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 
 
 template<class Type>
-waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
+Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -81,7 +76,7 @@ waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 
 
 template<class Type>
-waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
+Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 (
     const waveTransmissiveFvPatchField& ptpsf
 )
@@ -93,7 +88,7 @@ waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 
 
 template<class Type>
-waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
+Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 (
     const waveTransmissiveFvPatchField& ptpsf,
     const DimensionedField<Type, volMesh>& iF
@@ -108,35 +103,32 @@ waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<scalarField> waveTransmissiveFvPatchField<Type>::advectionSpeed() const
+Foam::tmp<Foam::scalarField>
+Foam::waveTransmissiveFvPatchField<Type>::advectionSpeed() const
 {
     // Lookup the velocity and compressibility of the patch
-    const fvPatchField<scalar>& psip = this->patch().lookupPatchField
-    (
-        psiName_,
-        reinterpret_cast<const volScalarField*>(0),
-        reinterpret_cast<const scalar*>(0)
-    );
+    const fvPatchField<scalar>& psip =
+        this->patch().template lookupPatchField<volScalarField, scalar>
+        (
+            psiName_
+        );
 
     const surfaceScalarField& phi =
-        this->db().objectRegistry::lookupObject<surfaceScalarField>
-        (this->phiName_);
+        this->db().template lookupObject<surfaceScalarField>(this->phiName_);
 
-    fvsPatchField<scalar> phip = this->patch().lookupPatchField
-    (
-        this->phiName_,
-        reinterpret_cast<const surfaceScalarField*>(0),
-        reinterpret_cast<const scalar*>(0)
-    );
+    fvsPatchField<scalar> phip =
+        this->patch().template lookupPatchField<surfaceScalarField, scalar>
+        (
+            this->phiName_
+        );
 
     if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
     {
-        const fvPatchScalarField& rhop = this->patch().lookupPatchField
-        (
-            this->rhoName_,
-            reinterpret_cast<const volScalarField*>(0),
-            reinterpret_cast<const scalar*>(0)
-        );
+        const fvPatchScalarField& rhop =
+            this->patch().template lookupPatchField<volScalarField, scalar>
+            (
+                this->rhoName_
+            );
 
         phip /= rhop;
     }
@@ -149,7 +141,7 @@ tmp<scalarField> waveTransmissiveFvPatchField<Type>::advectionSpeed() const
 
 
 template<class Type>
-void waveTransmissiveFvPatchField<Type>::write(Ostream& os) const
+void Foam::waveTransmissiveFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
 
@@ -165,6 +157,7 @@ void waveTransmissiveFvPatchField<Type>::write(Ostream& os) const
     {
         os.writeKeyword("psi") << psiName_ << token::END_STATEMENT << nl;
     }
+
     os.writeKeyword("gamma") << gamma_ << token::END_STATEMENT << nl;
 
     if (this->lInf_ > SMALL)
@@ -179,8 +172,4 @@ void waveTransmissiveFvPatchField<Type>::write(Ostream& os) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
index cd786d09fa..a489b8c935 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
@@ -256,7 +256,11 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
             "fvSchemes",
             obr.time().system(),
             obr,
-            IOobject::MUST_READ_IF_MODIFIED,
+            (
+                obr.readOpt() == IOobject::MUST_READ
+              ? IOobject::MUST_READ_IF_MODIFIED
+              : obr.readOpt()
+            ),
             IOobject::NO_WRITE
         )
     ),
@@ -364,7 +368,14 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
     // persistent settings across reads is incorrect
     clear();
 
-    read(schemesDict());
+    if
+    (
+        readOpt() == IOobject::MUST_READ
+     || readOpt() == IOobject::MUST_READ_IF_MODIFIED
+    )
+    {
+        read(schemesDict());
+    }
 }
 
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.H
index 55d003a16a..e6852dffa2 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.H
@@ -37,11 +37,7 @@ SourceFiles
 #define pointEdgeStructuredWalk_H
 
 #include "point.H"
-#include "label.H"
-#include "scalar.H"
 #include "tensor.H"
-#include "pTraits.H"
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -75,10 +71,12 @@ class pointEdgeStructuredWalk
     // Private Member Functions
 
         //- Evaluate distance to point.
+        template<class TrackingData>
         inline bool update
         (
             const pointEdgeStructuredWalk& w2,
-            const scalar tol
+            const scalar tol,
+            TrackingData& td
         );
 
 public:
@@ -111,80 +109,105 @@ public:
 
         // Needed by meshWave
 
-            //- Check whether still contains original (invalid) value.
-            inline bool valid() const;
+            //- Check whether origin has been changed at all or
+            //  still contains original (invalid) value.
+            template<class TrackingData>
+            inline bool valid(TrackingData& td) const;
 
             //- Check for identical geometrical data. Used for cyclics checking.
+            template<class TrackingData>
             inline bool sameGeometry
             (
                 const pointEdgeStructuredWalk&,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             ) const;
 
             //- Convert origin to relative vector to leaving point
             //  (= point coordinate)
+            template<class TrackingData>
             inline void leaveDomain
             (
                 const polyPatch& patch,
                 const label patchPointI,
-                const point& pos
+                const point& pos,
+                TrackingData& td
             );
 
             //- Convert relative origin to absolute by adding entering point
+            template<class TrackingData>
             inline void enterDomain
             (
                 const polyPatch& patch,
                 const label patchPointI,
-                const point& pos
+                const point& pos,
+                TrackingData& td
             );
 
             //- Apply rotation matrix to origin
-            inline void transform(const tensor& rotTensor);
+            template<class TrackingData>
+            inline void transform
+            (
+                const tensor& rotTensor,
+                TrackingData& td
+            );
 
             //- Influence of edge on point
+            template<class TrackingData>
             inline bool updatePoint
             (
                 const polyMesh& mesh,
                 const label pointI,
                 const label edgeI,
                 const pointEdgeStructuredWalk& edgeInfo,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             );
 
             //- Influence of different value on same point.
             //  Merge new and old info.
+            template<class TrackingData>
             inline bool updatePoint
             (
                 const polyMesh& mesh,
                 const label pointI,
                 const pointEdgeStructuredWalk& newPointInfo,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             );
 
             //- Influence of different value on same point.
             //  No information about current position whatsoever.
+            template<class TrackingData>
             inline bool updatePoint
             (
                 const pointEdgeStructuredWalk& newPointInfo,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             );
 
             //- Influence of point on edge.
+            template<class TrackingData>
             inline bool updateEdge
             (
                 const polyMesh& mesh,
                 const label edgeI,
                 const label pointI,
                 const pointEdgeStructuredWalk& pointInfo,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             );
 
+            //- Same (like operator==)
+            template<class TrackingData>
+            inline bool equal(const pointEdgeStructuredWalk&, TrackingData&)
+            const;
+
 
     // Member Operators
 
         //Note: Used to determine whether to call update.
         inline bool operator==(const pointEdgeStructuredWalk&) const;
-
         inline bool operator!=(const pointEdgeStructuredWalk&) const;
 
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
index d60e9b52f7..47adcdb775 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
@@ -29,13 +29,15 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // Update this with w2.
+template<class TrackingData>
 inline bool Foam::pointEdgeStructuredWalk::update
 (
     const pointEdgeStructuredWalk& w2,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
-    if (!valid())
+    if (!valid(td))
     {
         // current not yet set. Walked from w2 to here (=point0)
         dist_ = w2.dist_ + mag(point0_-w2.previousPoint_);
@@ -105,17 +107,20 @@ inline const Foam::vector& Foam::pointEdgeStructuredWalk::data() const
 }
 
 
-inline bool Foam::pointEdgeStructuredWalk::valid() const
+template<class TrackingData>
+inline bool Foam::pointEdgeStructuredWalk::valid(TrackingData& td) const
 {
     return previousPoint_ != vector::max;
 }
 
 
 // Checks for cyclic points
+template<class TrackingData>
 inline bool Foam::pointEdgeStructuredWalk::sameGeometry
 (
     const pointEdgeStructuredWalk& w2,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 ) const
 {
     scalar diff = Foam::mag(dist() - w2.dist());
@@ -138,18 +143,25 @@ inline bool Foam::pointEdgeStructuredWalk::sameGeometry
 }
 
 
+template<class TrackingData>
 inline void Foam::pointEdgeStructuredWalk::leaveDomain
 (
     const polyPatch& patch,
     const label patchPointI,
-    const point& coord
+    const point& coord,
+    TrackingData& td
 )
 {
     previousPoint_ -= coord;
 }
 
 
-inline void Foam::pointEdgeStructuredWalk::transform(const tensor& rotTensor)
+template<class TrackingData>
+inline void Foam::pointEdgeStructuredWalk::transform
+(
+    const tensor& rotTensor,
+    TrackingData& td
+)
 {
     previousPoint_ = Foam::transform(rotTensor, previousPoint_);
 }
@@ -157,11 +169,13 @@ inline void Foam::pointEdgeStructuredWalk::transform(const tensor& rotTensor)
 
 // Update absolute geometric quantities. Note that distance (dist_)
 // is not affected by leaving/entering domain.
+template<class TrackingData>
 inline void Foam::pointEdgeStructuredWalk::enterDomain
 (
     const polyPatch& patch,
     const label patchPointI,
-    const point& coord
+    const point& coord,
+    TrackingData& td
 )
 {
     // back to absolute form
@@ -170,18 +184,20 @@ inline void Foam::pointEdgeStructuredWalk::enterDomain
 
 
 // Update this with information from connected edge
+template<class TrackingData>
 inline bool Foam::pointEdgeStructuredWalk::updatePoint
 (
     const polyMesh& mesh,
     const label pointI,
     const label edgeI,
     const pointEdgeStructuredWalk& edgeInfo,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
     if (inZone())
     {
-        return update(edgeInfo, tol);
+        return update(edgeInfo, tol, td);
     }
     else
     {
@@ -191,17 +207,19 @@ inline bool Foam::pointEdgeStructuredWalk::updatePoint
 
 
 // Update this with new information on same point
+template<class TrackingData>
 inline bool Foam::pointEdgeStructuredWalk::updatePoint
 (
     const polyMesh& mesh,
     const label pointI,
     const pointEdgeStructuredWalk& newPointInfo,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
     if (inZone())
     {
-        return update(newPointInfo, tol);
+        return update(newPointInfo, tol, td);
     }
     else
     {
@@ -211,29 +229,33 @@ inline bool Foam::pointEdgeStructuredWalk::updatePoint
 
 
 // Update this with new information on same point. No extra information.
+template<class TrackingData>
 inline bool Foam::pointEdgeStructuredWalk::updatePoint
 (
     const pointEdgeStructuredWalk& newPointInfo,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
-    return update(newPointInfo, tol);
+    return update(newPointInfo, tol, td);
 }
 
 
 // Update this with information from connected point
+template<class TrackingData>
 inline bool Foam::pointEdgeStructuredWalk::updateEdge
 (
     const polyMesh& mesh,
     const label edgeI,
     const label pointI,
     const pointEdgeStructuredWalk& pointInfo,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
     if (inZone())
     {
-        return update(pointInfo, tol);
+        return update(pointInfo, tol, td);
     }
     else
     {
@@ -242,6 +264,17 @@ inline bool Foam::pointEdgeStructuredWalk::updateEdge
 }
 
 
+template <class TrackingData>
+inline bool Foam::pointEdgeStructuredWalk::equal
+(
+    const pointEdgeStructuredWalk& rhs,
+    TrackingData& td
+) const
+{
+    return operator==(rhs);
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 inline bool Foam::pointEdgeStructuredWalk::operator==
diff --git a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
index 7ed2a34bba..486052b9db 100644
--- a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
@@ -91,6 +91,9 @@ void Foam::inversePointDistanceDiffusivity::correct()
     List<pointEdgePoint> pointWallDist(mesh.nPoints());
     List<pointEdgePoint> edgeWallDist(mesh.nEdges());
 
+    int dummyTrackData = 0;
+
+
     {
         // Seeds
         List<pointEdgePoint> seedInfo(nPatchEdges);
@@ -108,7 +111,7 @@ void Foam::inversePointDistanceDiffusivity::correct()
             {
                 label pointI = meshPoints[i];
 
-                if (!pointWallDist[pointI].valid())
+                if (!pointWallDist[pointI].valid(dummyTrackData))
                 {
                     // Not yet seeded
                     seedInfo[nPatchEdges] = pointEdgePoint
@@ -135,7 +138,8 @@ void Foam::inversePointDistanceDiffusivity::correct()
 
             pointWallDist,
             edgeWallDist,
-            mesh.globalData().nTotalPoints() // max iterations
+            mesh.globalData().nTotalPoints(),// max iterations
+            dummyTrackData
         );
     }
 
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index 511fcc74d5..15dd9027b9 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -86,7 +86,8 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
     // referred cells that they interact with.
     PackedBoolList cellInRangeOfCoupledPatch(mesh_.nCells(), false);
 
-    // IAndT: index and transform
+    // IAndT: index (=local cell index) and transform (from
+    // globalIndexAndTransform)
     DynamicList<labelPair> cellIAndTToExchange;
 
     DynamicList<treeBoundBox> cellBbsToExchange;
@@ -179,7 +180,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
 
         treeBoundBox tempTransformedBb
         (
-            transform.invTransform(cellBbsToExchange[bbI].corners())
+            transform.invTransform(cellBbsToExchange[bbI].points())
         );
 
         treeBoundBox extendedBb
@@ -396,7 +397,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
 
         treeBoundBox tempTransformedBb
         (
-            transform.invTransform(wallFaceBbsToExchange[bbI].corners())
+            transform.invTransform(wallFaceBbsToExchange[bbI].points())
         );
 
         treeBoundBox extendedBb
@@ -701,7 +702,7 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
                         (
                             transform.transform
                             (
-                                allExtendedProcBbs[procI].corners()
+                                allExtendedProcBbs[procI].points()
                             )
                         );
 
@@ -748,7 +749,7 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
                     (
                         transform.transform
                         (
-                            allExtendedProcBbs[procI].corners()
+                            allExtendedProcBbs[procI].points()
                         )
                     );
 
@@ -791,7 +792,7 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
                 (
                     transform.transform
                     (
-                        allExtendedProcBbs[procI].corners()
+                        allExtendedProcBbs[procI].points()
                     )
                 );
 
diff --git a/src/lagrangian/basic/Particle/Particle.C b/src/lagrangian/basic/Particle/Particle.C
index b0bc7a8d0c..a56ab267a2 100644
--- a/src/lagrangian/basic/Particle/Particle.C
+++ b/src/lagrangian/basic/Particle/Particle.C
@@ -371,10 +371,21 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
         {
             // Apply tracking correction towards tet centre
 
+            if (debug)
+            {
+                Pout<< "tracking rescue using tetCentre from " << position();
+            }
+
             position_ +=
                 Cloud<ParticleType>::trackingCorrectionTol
                *(tet.centre() - position_);
 
+            if (debug)
+            {
+                Pout<< " to " << position() << " due to "
+                    << (tet.centre() - position_) << endl;
+            }
+
             cloud_.trackingRescue();
 
             return trackFraction;
@@ -639,6 +650,12 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
 
         tetPointRef tet = currentTet();
 
+        if (debug)
+        {
+            Pout<< "tracking rescue for lambdaMin:" << lambdaMin
+                << "from " << position();
+        }
+
         position_ +=
             Cloud<ParticleType>::trackingCorrectionTol
            *(tet.centre() - position_);
@@ -692,6 +709,11 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
             }
         }
 
+        if (debug)
+        {
+            Pout<< " to " << position() << endl;
+        }
+
         cloud_.trackingRescue();
     }
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index 1d3219972c..68d1762993 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -159,11 +159,6 @@ Foam::label Foam::autoLayerDriver::mergePatchFacesUndo
             mesh.clearOut();
         }
 
-        if (meshRefiner_.overwrite())
-        {
-            mesh.setInstance(meshRefiner_.oldInstance());
-        }
-
         faceCombiner.updateMesh(map);
 
         meshRefiner_.updateMesh(map, labelList(0));
@@ -324,11 +319,6 @@ Foam::label Foam::autoLayerDriver::mergePatchFacesUndo
                 mesh.clearOut();
             }
 
-            if (meshRefiner_.overwrite())
-            {
-                mesh.setInstance(meshRefiner_.oldInstance());
-            }
-
             faceCombiner.updateMesh(map);
 
             // Renumber restore maps
@@ -396,11 +386,6 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoLayerDriver::doRemovePoints
         mesh.clearOut();
     }
 
-    if (meshRefiner_.overwrite())
-    {
-        mesh.setInstance(meshRefiner_.oldInstance());
-    }
-
     pointRemover.updateMesh(map);
     meshRefiner_.updateMesh(map, labelList(0));
 
@@ -454,11 +439,6 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoLayerDriver::doRestorePoints
         mesh.clearOut();
     }
 
-    if (meshRefiner_.overwrite())
-    {
-        mesh.setInstance(meshRefiner_.oldInstance());
-    }
-
     pointRemover.updateMesh(map);
     meshRefiner_.updateMesh(map, labelList(0));
 
@@ -3100,10 +3080,7 @@ void Foam::autoLayerDriver::addLayers
         //?neccesary? Update fields
         newMesh.updateMesh(map);
 
-        if (meshRefiner_.overwrite())
-        {
-            newMesh.setInstance(meshRefiner_.oldInstance());
-        }
+        newMesh.setInstance(meshRefiner_.timeName());
 
         // Update numbering on addLayer:
         // - cell/point labels to be newMesh.
@@ -3229,11 +3206,6 @@ void Foam::autoLayerDriver::addLayers
         mesh.clearOut();
     }
 
-    if (meshRefiner_.overwrite())
-    {
-        mesh.setInstance(meshRefiner_.oldInstance());
-    }
-
     meshRefiner_.updateMesh(map, labelList(0));
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
index 292ec5d142..d7abe804f7 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
@@ -756,6 +756,9 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
     // Distance to wall
     List<pointData> pointWallDist(mesh.nPoints());
 
+    // Dummy additional info for PointEdgeWave
+    int dummyTrackData = 0;
+
 
     // 1. Calculate distance to points where displacement is specified.
     {
@@ -783,7 +786,8 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
             wallInfo,
             pointWallDist,
             edgeWallDist,
-            mesh.globalData().nTotalPoints()    // max iterations
+            mesh.globalData().nTotalPoints(),   // max iterations
+            dummyTrackData
         );
     }
 
@@ -813,7 +817,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
                 {
                     label pointI = e[ep];
 
-                    if (!pointMedialDist[pointI].valid())
+                    if (!pointMedialDist[pointI].valid(dummyTrackData))
                     {
                         maxPoints.append(pointI);
                         maxInfo.append
@@ -857,7 +861,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
                 {
                     label pointI = meshPoints[i];
 
-                    if (!pointMedialDist[pointI].valid())
+                    if (!pointMedialDist[pointI].valid(dummyTrackData))
                     {
                         maxPoints.append(pointI);
                         maxInfo.append
@@ -888,7 +892,8 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
 
             pointMedialDist,
             edgeMedialDist,
-            mesh.globalData().nTotalPoints()    // max iterations
+            mesh.globalData().nTotalPoints(),   // max iterations
+            dummyTrackData
         );
 
         // Extract medial axis distance as pointScalarField
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C
index 6d97d1cd00..1d7f5090ae 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C
@@ -32,19 +32,20 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const pointData& wDist)
     if (os.format() == IOstream::ASCII)
     {
         return os
-            << wDist.origin() << token::SPACE << wDist.distSqr()
+            << static_cast<const pointEdgePoint&>(wDist)
             << token::SPACE << wDist.s() << token::SPACE << wDist.v();
     }
     else
     {
         return os
-            << wDist.origin() << wDist.distSqr() << wDist.s() << wDist.v();
+            << static_cast<const pointEdgePoint&>(wDist)
+            << wDist.s() << wDist.v();
     }
 }
 
 Foam::Istream& Foam::operator>>(Istream& is, pointData& wDist)
 {
-    return is >> wDist.origin_ >> wDist.distSqr_ >> wDist.s_ >> wDist.v_;
+    return is >> static_cast<pointEdgePoint&>(wDist) >> wDist.s_ >> wDist.v_;
 }
 
 // ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
index 050b9d92c7..7719079821 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
@@ -25,10 +25,10 @@ Class
     Foam::pointData
 
 Description
-    Holds information regarding nearest wall point. Used in pointEdgeWave.
-    (so not standard meshWave)
-
-    To be used in wall distance calculation.
+    Variant of pointEdgePoint with some transported additional data. 
+    WIP - should be templated on data like wallDistData.
+    Passive vector v_ is not a coordinate (so no enterDomain/leaveDomain
+    transformation needed)
 
 SourceFiles
     pointDataI.H
@@ -39,9 +39,10 @@ SourceFiles
 #ifndef pointData_H
 #define pointData_H
 
-#include "point.H"
-#include "label.H"
-#include "tensor.H"
+#include "pointEdgePoint.H"
+//#include "point.H"
+//#include "label.H"
+//#include "tensor.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -49,51 +50,22 @@ SourceFiles
 namespace Foam
 {
 
-// Class forward declarations
-class polyPatch;
-class polyMesh;
-
 /*---------------------------------------------------------------------------*\
                            Class pointData Declaration
 \*---------------------------------------------------------------------------*/
 
 class pointData
+:
+    public pointEdgePoint
 {
     // Private data
 
-        //- position of nearest wall center
-        point origin_;
-
-        //- normal distance (squared) from point to origin
-        scalar distSqr_;
-
         //- additional information.
         scalar s_;
 
         //- additional information.
         vector v_;
 
-
-    // Private Member Functions
-
-        //- Evaluate distance to point. Update distSqr, origin from whomever
-        //  is nearer pt. Return true if w2 is closer to point,
-        //  false otherwise.
-        inline bool update
-        (
-            const point&,
-            const pointData& w2,
-            const scalar tol
-        );
-
-        //- Combine current with w2. Update distSqr, origin if w2 has smaller
-        //  quantities and returns true.
-        inline bool update
-        (
-            const pointData& w2,
-            const scalar tol
-        );
-
 public:
 
     // Constructors
@@ -118,10 +90,6 @@ public:
 
         // Access
 
-            inline const point& origin() const;
-
-            inline scalar distSqr() const;
-
             inline scalar s() const;
 
             inline const vector& v() const;
@@ -129,81 +97,60 @@ public:
 
         // Needed by meshWave
 
-            //- Check whether origin has been changed at all or
-            //  still contains original (invalid) value.
-            inline bool valid() const;
-
-            //- Check for identical geometrical data. Used for cyclics checking.
-            inline bool sameGeometry(const pointData&, const scalar tol)
-             const;
-
-            //- Convert origin to relative vector to leaving point
-            //  (= point coordinate)
-            inline void leaveDomain
-            (
-                const polyPatch& patch,
-                const label patchPointI,
-                const point& pos
-            );
-
-            //- Convert relative origin to absolute by adding entering point
-            inline void enterDomain
-            (
-                const polyPatch& patch,
-                const label patchPointI,
-                const point& pos
-            );
-
             //- Apply rotation matrix to origin
-            inline void transform(const tensor& rotTensor);
+            template<class TrackingData>
+            inline void transform
+            (
+                const tensor& rotTensor,
+                TrackingData& td
+            );
 
             //- Influence of edge on point
+            template<class TrackingData>
             inline bool updatePoint
             (
                 const polyMesh& mesh,
                 const label pointI,
                 const label edgeI,
                 const pointData& edgeInfo,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             );
 
             //- Influence of different value on same point.
             //  Merge new and old info.
+            template<class TrackingData>
             inline bool updatePoint
             (
                 const polyMesh& mesh,
                 const label pointI,
                 const pointData& newPointInfo,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             );
 
             //- Influence of different value on same point.
             //  No information about current position whatsoever.
+            template<class TrackingData>
             inline bool updatePoint
             (
                 const pointData& newPointInfo,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             );
 
             //- Influence of point on edge.
+            template<class TrackingData>
             inline bool updateEdge
             (
                 const polyMesh& mesh,
                 const label edgeI,
                 const label pointI,
                 const pointData& pointInfo,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             );
 
-
-    // Member Operators
-
-        //Note: Used to determine whether to call update.
-        inline bool operator==(const pointData&) const;
-
-        inline bool operator!=(const pointData&) const;
-
-
     // IOstream Operators
 
         friend Ostream& operator<<(Ostream&, const pointData&);
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
index a04038c247..c2228eca82 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
@@ -26,118 +26,12 @@ License
 #include "polyMesh.H"
 #include "transform.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-// Update this with w2 if w2 nearer to pt.
-inline bool Foam::pointData::update
-(
-    const point& pt,
-    const pointData& w2,
-    const scalar tol
-)
-{
-    scalar dist2 = magSqr(pt - w2.origin());
-
-    if (!valid())
-    {
-        distSqr_ = dist2;
-        origin_ = w2.origin();
-        s_ = w2.s();
-        v_ = w2.v();
-
-        return true;
-    }
-
-
-//    if (v_ != w2.v())
-//    {
-//        return false;
-//    }
-
-
-    scalar diff = distSqr_ - dist2;
-
-    if (diff < 0)
-    {
-        // already nearer to pt
-        return false;
-    }
-
-    if ((diff < SMALL) || ((distSqr_ > SMALL) && (diff/distSqr_ < tol)))
-    {
-        // don't propagate small changes
-        return false;
-    }
-    else
-    {
-        // update with new values
-        distSqr_ = dist2;
-        origin_ = w2.origin();
-        s_ = w2.s();
-        v_ = w2.v();
-
-        return true;
-    }
-}
-
-
-// Update this with w2 (information on same point)
-inline bool Foam::pointData::update
-(
-    const pointData& w2,
-    const scalar tol
-)
-{
-    if (!valid())
-    {
-        // current not yet set so use any value
-        distSqr_ = w2.distSqr();
-        origin_ = w2.origin();
-        s_ = w2.s();
-        v_ = w2.v();
-        return true;
-    }
-
-
-//    if (v_ != w2.v())
-//    {
-//        return false;
-//    }
-
-
-    scalar diff = distSqr_ - w2.distSqr();
-
-    if (diff < 0)
-    {
-        // already nearer to pt
-        return false;
-    }
-
-    if ((diff < SMALL) || ((distSqr_ > SMALL) && (diff/distSqr_ < tol)))
-    {
-        // don't propagate small changes
-        return false;
-    }
-    else
-    {
-        // update with new values
-        distSqr_ =  w2.distSqr();
-        origin_ = w2.origin();
-        s_ = w2.s();
-        v_ = w2.v();
-
-        return true;
-    }
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Null constructor
 inline Foam::pointData::pointData()
 :
-    origin_(point::max),
-    distSqr_(GREAT),
+    pointEdgePoint(),
     s_(GREAT),
     v_(point::max)
 {}
@@ -152,8 +46,7 @@ inline Foam::pointData::pointData
     const vector& v
 )
 :
-    origin_(origin),
-    distSqr_(distSqr),
+    pointEdgePoint(origin, distSqr),
     s_(s),
     v_(v)
 {}
@@ -162,8 +55,7 @@ inline Foam::pointData::pointData
 // Construct as copy
 inline Foam::pointData::pointData(const pointData& wpt)
 :
-    origin_(wpt.origin()),
-    distSqr_(wpt.distSqr()),
+    pointEdgePoint(wpt),
     s_(wpt.s()),
     v_(wpt.v())
 {}
@@ -171,18 +63,6 @@ inline Foam::pointData::pointData(const pointData& wpt)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline const Foam::point& Foam::pointData::origin() const
-{
-    return origin_;
-}
-
-
-inline Foam::scalar Foam::pointData::distSqr() const
-{
-    return distSqr_;
-}
-
-
 inline Foam::scalar Foam::pointData::s() const
 {
     return s_;
@@ -195,157 +75,143 @@ inline const Foam::vector& Foam::pointData::v() const
 }
 
 
-inline bool Foam::pointData::valid() const
-{
-    return origin_ != point::max;
-}
-
-
-// Checks for cyclic points
-inline bool Foam::pointData::sameGeometry
+template <class TrackingData>
+inline void Foam::pointData::transform
 (
-    const pointData& w2,
-    const scalar tol
-) const
-{
-    scalar diff = Foam::mag(distSqr() - w2.distSqr());
-
-    if (diff < SMALL)
-    {
-        return true;
-    }
-    else
-    {
-        if ((distSqr() > SMALL) && ((diff/distSqr()) < tol))
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-}
-
-
-inline void Foam::pointData::leaveDomain
-(
-    const polyPatch& patch,
-    const label patchPointI,
-    const point& coord
+    const tensor& rotTensor,
+    TrackingData& td
 )
 {
-    origin_ -= coord;
-}
-
-
-inline void Foam::pointData::transform(const tensor& rotTensor)
-{
-    origin_ = Foam::transform(rotTensor, origin_);
-}
-
-
-// Update absolute geometric quantities. Note that distance (distSqr_)
-// is not affected by leaving/entering domain.
-inline void Foam::pointData::enterDomain
-(
-    const polyPatch& patch,
-    const label patchPointI,
-    const point& coord
-)
-{
-    // back to absolute form
-    origin_ += coord;
+    pointEdgePoint::transform(rotTensor, td);
+    v_ = Foam::transform(rotTensor, v_);
 }
 
 
 // Update this with information from connected edge
+template <class TrackingData>
 inline bool Foam::pointData::updatePoint
 (
     const polyMesh& mesh,
     const label pointI,
     const label edgeI,
     const pointData& edgeInfo,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
-    return
-        update
+    if
+    (
+        pointEdgePoint::updatePoint
         (
-            mesh.points()[pointI],
+            mesh,
+            pointI,
+            edgeI,
             edgeInfo,
-            tol
-        );
+            tol,
+            td
+        )
+    )
+    {
+        s_ = edgeInfo.s_;
+        v_ = edgeInfo.v_;
+        return true;
     }
-
+    else
+    {
+        return false;
+    }
+}
 
 // Update this with new information on same point
+template <class TrackingData>
 inline bool Foam::pointData::updatePoint
 (
     const polyMesh& mesh,
     const label pointI,
     const pointData& newPointInfo,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
-    return
-        update
+    if
+    (
+        pointEdgePoint::updatePoint
         (
-            mesh.points()[pointI],
+            mesh,
+            pointI,
             newPointInfo,
-            tol
-        );
+            tol,
+            td
+        )
+    )
+    {
+        s_ = newPointInfo.s_;
+        v_ = newPointInfo.v_;
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 
 // Update this with new information on same point. No extra information.
+template <class TrackingData>
 inline bool Foam::pointData::updatePoint
 (
     const pointData& newPointInfo,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
-    return update(newPointInfo, tol);
+    if (pointEdgePoint::updatePoint(newPointInfo, tol, td))
+    {
+        s_ = newPointInfo.s_;
+        v_ = newPointInfo.v_;
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 
 // Update this with information from connected point
+template <class TrackingData>
 inline bool Foam::pointData::updateEdge
 (
     const polyMesh& mesh,
     const label edgeI,
     const label pointI,
     const pointData& pointInfo,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
+
 )
 {
-    const pointField& points = mesh.points();
-
-    const edge& e = mesh.edges()[edgeI];
-
-    const point edgeMid(0.5*(points[e[0]] + points[e[1]]));
-
-    return
-        update
+    if
+    (
+        pointEdgePoint::updateEdge
         (
-            edgeMid,
+            mesh,
+            edgeI,
+            pointI,
             pointInfo,
-            tol
-        );
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-inline bool Foam::pointData::operator==(const pointData& rhs) const
-{
-    return origin() == rhs.origin();
-}
-
-
-inline bool Foam::pointData::operator!=(const pointData& rhs) const
-{
-    return !(*this == rhs);
+            tol,
+            td
+        )
+    )
+    {
+        s_ = pointInfo.s_;
+        v_ = pointInfo.v_;
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 512c651449..bcc98f1dff 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -481,11 +481,6 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRemoveCells
         mesh_.clearOut();
     }
 
-    if (overwrite_)
-    {
-        mesh_.setInstance(oldInstance_);
-    }
-
     // Update local mesh data
     cellRemover.updateMesh(map);
 
@@ -1903,9 +1898,14 @@ void Foam::meshRefinement::distribute(const mapDistributePolyMesh& map)
             pointMap.clear();
         }
     }
+
+    // If necessary reset the instance
+    mesh_.setInstance(timeName());
+    setInstance(mesh_.facesInstance());
 }
 
 
+// Update local data for a mesh change
 void Foam::meshRefinement::updateMesh
 (
     const mapPolyMesh& map,
@@ -2027,6 +2027,10 @@ void Foam::meshRefinement::updateMesh
             data.transfer(newFaceData);
         }
     }
+
+    // If necessary reset the instance
+    mesh_.setInstance(timeName());
+    setInstance(mesh_.facesInstance());
 }
 
 
@@ -2137,7 +2141,7 @@ void Foam::meshRefinement::dumpRefinementLevel() const
         IOobject
         (
             "cellLevel",
-            timeName(),
+            mesh_.time().timeName(),// Dump to current time, not to mesh inst
             mesh_,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE,
@@ -2165,7 +2169,7 @@ void Foam::meshRefinement::dumpRefinementLevel() const
         IOobject
         (
             "pointLevel",
-            timeName(),
+            mesh_.time().timeName(),// Dump to current time, not to mesh inst
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index a445ebf699..f43e4ab7e2 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -517,11 +517,6 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
         mesh_.clearOut();
     }
 
-    if (overwrite())
-    {
-        mesh_.setInstance(oldInstance());
-    }
-
     //- Redo the intersections on the newly create baffle faces. Note that
     //  this changes also the cell centre positions.
     faceSet baffledFacesSet(mesh_, "baffledFacesSet", 2*nBaffles);
@@ -965,11 +960,6 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeBaffles
         mesh_.clearOut();
     }
 
-    if (overwrite())
-    {
-        mesh_.setInstance(oldInstance());
-    }
-
     // Update intersections. Recalculate intersections on merged faces since
     // this seems to give problems? Note: should not be nessecary since
     // baffles preserve intersections from when they were created.
@@ -2249,11 +2239,6 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints()
         mesh_.clearOut();
     }
 
-    if (overwrite())
-    {
-        mesh_.setInstance(oldInstance());
-    }
-
     // Update intersections. Is mapping only (no faces created, positions stay
     // same) so no need to recalculate intersections.
     updateMesh(map, labelList(0));
@@ -2783,11 +2768,6 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
         mesh_.clearOut();
     }
 
-    if (overwrite())
-    {
-        mesh_.setInstance(oldInstance());
-    }
-
     // Print some stats (note: zones are synchronised)
     if (mesh_.cellZones().size() > 0)
     {
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
index 98dfe5aed5..c32446d3a2 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
@@ -103,11 +103,6 @@ Foam::label Foam::meshRefinement::mergePatchFaces
             mesh_.clearOut();
         }
 
-        if (overwrite())
-        {
-            mesh_.setInstance(oldInstance());
-        }
-
         faceCombiner.updateMesh(map);
 
         // Get the kept faces that need to be recalculated.
@@ -203,11 +198,6 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeEdges
             mesh_.clearOut();
         }
 
-        if (overwrite())
-        {
-            mesh_.setInstance(oldInstance());
-        }
-
         pointRemover.updateMesh(map);
 
         // Get the kept faces that need to be recalculated.
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
index 98b0a34ae7..76c27d7d2b 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
@@ -1236,11 +1236,6 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::refine
         mesh_.clearOut();
     }
 
-    if (overwrite())
-    {
-        mesh_.setInstance(oldInstance());
-    }
-
     // Update intersection info
     updateMesh(map, getChangedFaces(map, cellsToRefine));
 
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 2c9f81195d..47310b27e3 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -127,6 +127,7 @@ $(cellZoneSources)/setToCellZone/setToCellZone.C
 pointZoneSources = sets/pointZoneSources
 $(pointZoneSources)/setToPointZone/setToPointZone.C
 
+momentOfInertia/momentOfInertia.C
 
 surfaceSets/surfaceSets.C
 
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWave.C b/src/meshTools/PointEdgeWave/PointEdgeWave.C
index 304675d71f..a11d6601be 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWave.C
+++ b/src/meshTools/PointEdgeWave/PointEdgeWave.C
@@ -32,36 +32,25 @@ License
 #include "PstreamCombineReduceOps.H"
 #include "debug.H"
 #include "typeInfo.H"
+#include "globalMeshData.H"
+#include "pointFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template <class Type>
-Foam::scalar Foam::PointEdgeWave<Type>::propagationTol_ = 0.01;
+template <class Type, class TrackingData>
+Foam::scalar Foam::PointEdgeWave<Type, TrackingData>::propagationTol_ = 0.01;
 
-
-// Offset labelList. Used for transferring from one cyclic half to the other.
-template <class Type>
-void Foam::PointEdgeWave<Type>::offset(const label val, labelList& elems)
-{
-    forAll(elems, i)
-    {
-        elems[i] += val;
-    }
-}
+template <class Type, class TrackingData>
+Foam::label Foam::PointEdgeWave<Type, TrackingData>::dummyTrackData_ = 12345;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Gets point-point correspondence. Is
-// - list of halfA points (in cyclic patch points)
-// - list of halfB points (can overlap with A!)
-// - for every patchPoint its corresponding point
 // Handle leaving domain. Implementation referred to Type
-template <class Type>
-void Foam::PointEdgeWave<Type>::leaveDomain
+template <class Type, class TrackingData>
+void Foam::PointEdgeWave<Type, TrackingData>::leaveDomain
 (
-    const polyPatch& meshPatch,
-    const primitivePatch& patch,
+    const polyPatch& patch,
     const labelList& patchPointLabels,
     List<Type>& pointInfo
 ) const
@@ -74,17 +63,16 @@ void Foam::PointEdgeWave<Type>::leaveDomain
 
         const point& pt = patch.points()[meshPoints[patchPointI]];
 
-        pointInfo[i].leaveDomain(meshPatch, patchPointI, pt);
+        pointInfo[i].leaveDomain(patch, patchPointI, pt, td_);
     }
 }
 
 
 // Handle entering domain. Implementation referred to Type
-template <class Type>
-void Foam::PointEdgeWave<Type>::enterDomain
+template <class Type, class TrackingData>
+void Foam::PointEdgeWave<Type, TrackingData>::enterDomain
 (
-    const polyPatch& meshPatch,
-    const primitivePatch& patch,
+    const polyPatch& patch,
     const labelList& patchPointLabels,
     List<Type>& pointInfo
 ) const
@@ -97,15 +85,16 @@ void Foam::PointEdgeWave<Type>::enterDomain
 
         const point& pt = patch.points()[meshPoints[patchPointI]];
 
-        pointInfo[i].enterDomain(meshPatch, patchPointI, pt);
+        pointInfo[i].enterDomain(patch, patchPointI, pt, td_);
     }
 }
 
 
 // Transform. Implementation referred to Type
-template <class Type>
-void Foam::PointEdgeWave<Type>::transform
+template <class Type, class TrackingData>
+void Foam::PointEdgeWave<Type, TrackingData>::transform
 (
+    const polyPatch& patch,
     const tensorField& rotTensor,
     List<Type>& pointInfo
 ) const
@@ -116,19 +105,22 @@ void Foam::PointEdgeWave<Type>::transform
 
         forAll(pointInfo, i)
         {
-            pointInfo[i].transform(T);
+            pointInfo[i].transform(T, td_);
         }
     }
     else
     {
         FatalErrorIn
         (
-            "PointEdgeWave<Type>::transform(const tensorField&, List<Type>&)"
-        )   << "Parallel cyclics not supported" << abort(FatalError);
+            "PointEdgeWave<Type, TrackingData>::transform"
+            "(const tensorField&, List<Type>&)"
+        )   << "Non-uniform transformation on patch " << patch.name()
+            << " not supported for point fields"
+            << abort(FatalError);
 
         forAll(pointInfo, i)
         {
-            pointInfo[i].transform(rotTensor[i]);
+            pointInfo[i].transform(rotTensor[i], td_);
         }
     }
 }
@@ -139,19 +131,18 @@ void Foam::PointEdgeWave<Type>::transform
 // Updates:
 //      - changedPoint_, changedPoints_, nChangedPoints_,
 //      - statistics: nEvals_, nUnvisitedPoints_
-template <class Type>
-bool Foam::PointEdgeWave<Type>::updatePoint
+template <class Type, class TrackingData>
+bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
 (
     const label pointI,
     const label neighbourEdgeI,
     const Type& neighbourInfo,
-    const scalar tol,
     Type& pointInfo
 )
 {
     nEvals_++;
 
-    bool wasValid = pointInfo.valid();
+    bool wasValid = pointInfo.valid(td_);
 
     bool propagate =
         pointInfo.updatePoint
@@ -160,7 +151,8 @@ bool Foam::PointEdgeWave<Type>::updatePoint
             pointI,
             neighbourEdgeI,
             neighbourInfo,
-            tol
+            propagationTol_,
+            td_
         );
 
     if (propagate)
@@ -172,7 +164,7 @@ bool Foam::PointEdgeWave<Type>::updatePoint
         }
     }
 
-    if (!wasValid && pointInfo.valid())
+    if (!wasValid && pointInfo.valid(td_))
     {
         --nUnvisitedPoints_;
     }
@@ -186,18 +178,17 @@ bool Foam::PointEdgeWave<Type>::updatePoint
 // Updates:
 //      - changedPoint_, changedPoints_, nChangedPoints_,
 //      - statistics: nEvals_, nUnvisitedPoints_
-template <class Type>
-bool Foam::PointEdgeWave<Type>::updatePoint
+template <class Type, class TrackingData>
+bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
 (
     const label pointI,
     const Type& neighbourInfo,
-    const scalar tol,
     Type& pointInfo
 )
 {
     nEvals_++;
 
-    bool wasValid = pointInfo.valid();
+    bool wasValid = pointInfo.valid(td_);
 
     bool propagate =
         pointInfo.updatePoint
@@ -205,7 +196,8 @@ bool Foam::PointEdgeWave<Type>::updatePoint
             mesh_,
             pointI,
             neighbourInfo,
-            tol
+            propagationTol_,
+            td_
         );
 
     if (propagate)
@@ -217,7 +209,7 @@ bool Foam::PointEdgeWave<Type>::updatePoint
         }
     }
 
-    if (!wasValid && pointInfo.valid())
+    if (!wasValid && pointInfo.valid(td_))
     {
         --nUnvisitedPoints_;
     }
@@ -231,19 +223,18 @@ bool Foam::PointEdgeWave<Type>::updatePoint
 // Updates:
 //      - changedEdge_, changedEdges_, nChangedEdges_,
 //      - statistics: nEvals_, nUnvisitedEdge_
-template <class Type>
-bool Foam::PointEdgeWave<Type>::updateEdge
+template <class Type, class TrackingData>
+bool Foam::PointEdgeWave<Type, TrackingData>::updateEdge
 (
     const label edgeI,
     const label neighbourPointI,
     const Type& neighbourInfo,
-    const scalar tol,
     Type& edgeInfo
 )
 {
     nEvals_++;
 
-    bool wasValid = edgeInfo.valid();
+    bool wasValid = edgeInfo.valid(td_);
 
     bool propagate =
         edgeInfo.updateEdge
@@ -252,7 +243,8 @@ bool Foam::PointEdgeWave<Type>::updateEdge
             edgeI,
             neighbourPointI,
             neighbourInfo,
-            tol
+            propagationTol_,
+            td_
         );
 
     if (propagate)
@@ -264,7 +256,7 @@ bool Foam::PointEdgeWave<Type>::updateEdge
         }
     }
 
-    if (!wasValid && edgeInfo.valid())
+    if (!wasValid && edgeInfo.valid(td_))
     {
         --nUnvisitedEdges_;
     }
@@ -274,9 +266,9 @@ bool Foam::PointEdgeWave<Type>::updateEdge
 
 
 // Check if patches of given type name are present
-template <class Type>
+template <class Type, class TrackingData>
 template <class PatchType>
-Foam::label Foam::PointEdgeWave<Type>::countPatchType() const
+Foam::label Foam::PointEdgeWave<Type, TrackingData>::countPatchType() const
 {
     label nPatches = 0;
 
@@ -291,199 +283,110 @@ Foam::label Foam::PointEdgeWave<Type>::countPatchType() const
 }
 
 
-// Collect changed patch points
-template <class Type>
-void Foam::PointEdgeWave<Type>::getChangedPatchPoints
-(
-    const primitivePatch& patch,
-
-    DynamicList<Type>& patchInfo,
-    DynamicList<label>& patchPoints,
-    DynamicList<label>& owner,
-    DynamicList<label>& ownerIndex
-) const
-{
-    const labelList& meshPoints = patch.meshPoints();
-    const faceList& localFaces = patch.localFaces();
-    const labelListList& pointFaces = patch.pointFaces();
-
-    forAll(meshPoints, patchPointI)
-    {
-        label meshPointI = meshPoints[patchPointI];
-
-        if (changedPoint_[meshPointI])
-        {
-            patchInfo.append(allPointInfo_[meshPointI]);
-            patchPoints.append(patchPointI);
-
-            label patchFaceI = pointFaces[patchPointI][0];
-
-            const face& f = localFaces[patchFaceI];
-
-            label index = findIndex(f, patchPointI);
-
-            owner.append(patchFaceI);
-            ownerIndex.append(index);
-        }
-    }
-
-    patchInfo.shrink();
-    patchPoints.shrink();
-    owner.shrink();
-    ownerIndex.shrink();
-}
-
-
-// Update overall for changed patch points
-template <class Type>
-void Foam::PointEdgeWave<Type>::updateFromPatchInfo
-(
-    const polyPatch& meshPatch,
-    const primitivePatch& patch,
-    const labelList& owner,
-    const labelList& ownerIndex,
-    List<Type>& patchInfo
-)
-{
-    const faceList& localFaces = patch.localFaces();
-    const labelList& meshPoints = patch.meshPoints();
-
-    // Get patch and mesh points.
-    labelList changedPatchPoints(patchInfo.size());
-    labelList changedMeshPoints(patchInfo.size());
-
-    forAll(owner, i)
-    {
-        label faceI = owner[i];
-
-        const face& f = localFaces[faceI];
-
-        label index = (f.size() - ownerIndex[i]) % f.size();
-
-        changedPatchPoints[i] = f[index];
-        changedMeshPoints[i] = meshPoints[f[index]];
-    }
-
-    // Adapt for entering domain
-    enterDomain(meshPatch, patch, changedPatchPoints, patchInfo);
-
-    // Merge received info
-    forAll(patchInfo, i)
-    {
-        updatePoint
-        (
-            changedMeshPoints[i],
-            patchInfo[i],
-            propagationTol_,
-            allPointInfo_[changedMeshPoints[i]]
-        );
-    }
-}
-
-
-
 // Transfer all the information to/from neighbouring processors
-template <class Type>
-void Foam::PointEdgeWave<Type>::handleProcPatches()
+template <class Type, class TrackingData>
+void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
 {
-    // 1. Send all point info on processor patches. Send as
-    // face label + offset in face.
+    // 1. Send all point info on processor patches.
 
-    forAll(mesh_.boundaryMesh(), patchI)
+    PstreamBuffers pBufs(Pstream::nonBlocking);
+
+    DynamicList<Type> patchInfo;
+    DynamicList<label> thisPoints;
+    DynamicList<label> nbrPoints;
+
+    forAll(mesh_.globalData().processorPatches(), i)
     {
-        const polyPatch& patch = mesh_.boundaryMesh()[patchI];
+        label patchI = mesh_.globalData().processorPatches()[i];
+        const processorPolyPatch& procPatch =
+            refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchI]);
 
-        if (isA<processorPolyPatch>(patch))
+        patchInfo.clear();
+        patchInfo.reserve(procPatch.nPoints());
+        thisPoints.clear();
+        thisPoints.reserve(procPatch.nPoints());
+        nbrPoints.clear();
+        nbrPoints.reserve(procPatch.nPoints());
+
+        // Get all changed points in reverse order
+        const labelList& neighbPoints = procPatch.neighbPoints();
+        forAll(neighbPoints, thisPointI)
         {
-            // Get all changed points in relative addressing
-
-            DynamicList<Type> patchInfo(patch.nPoints());
-            DynamicList<label> patchPoints(patch.nPoints());
-            DynamicList<label> owner(patch.nPoints());
-            DynamicList<label> ownerIndex(patch.nPoints());
-
-            getChangedPatchPoints
-            (
-                patch,
-                patchInfo,
-                patchPoints,
-                owner,
-                ownerIndex
-            );
-
-            // Adapt for leaving domain
-            leaveDomain(patch, patch, patchPoints, patchInfo);
-
-            const processorPolyPatch& procPatch =
-                refCast<const processorPolyPatch>(patch);
-
-            if (debug)
+            label meshPointI = procPatch.meshPoints()[thisPointI];
+            if (changedPoint_[meshPointI])
             {
-                Pout<< "Processor patch " << patchI << ' ' << patch.name()
-                    << " communicating with " << procPatch.neighbProcNo()
-                    << "  Sending:" << patchInfo.size() << endl;
-            }
-
-            {
-                OPstream toNeighbour
-                (
-                    Pstream::blocking,
-                    procPatch.neighbProcNo()
-                );
-
-                toNeighbour << owner << ownerIndex << patchInfo;
+                patchInfo.append(allPointInfo_[meshPointI]);
+                thisPoints.append(thisPointI);
+                nbrPoints.append(neighbPoints[thisPointI]);
             }
         }
+
+        // Adapt for leaving domain
+        leaveDomain(procPatch, thisPoints, patchInfo);
+
+        if (debug)
+        {
+            Pout<< "Processor patch " << patchI << ' ' << procPatch.name()
+                << " communicating with " << procPatch.neighbProcNo()
+                << "  Sending:" << patchInfo.size() << endl;
+        }
+
+        UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs);
+        toNeighbour << nbrPoints << patchInfo;
     }
 
 
+    pBufs.finishedSends();
+
     //
     // 2. Receive all point info on processor patches.
     //
 
-    forAll(mesh_.boundaryMesh(), patchI)
+    forAll(mesh_.globalData().processorPatches(), i)
     {
-        const polyPatch& patch = mesh_.boundaryMesh()[patchI];
+        label patchI = mesh_.globalData().processorPatches()[i];
+        const processorPolyPatch& procPatch =
+            refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchI]);
+
+        List<Type> patchInfo;
+        labelList patchPoints;
 
-        if (isA<processorPolyPatch>(patch))
         {
-            const processorPolyPatch& procPatch =
-                refCast<const processorPolyPatch>(patch);
+            UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs);
+            fromNeighbour >> patchPoints >> patchInfo;
+        }
 
-            List<Type> patchInfo;
-            labelList owner;
-            labelList ownerIndex;
+        if (debug)
+        {
+            Pout<< "Processor patch " << patchI << ' ' << procPatch.name()
+                << " communicating with " << procPatch.neighbProcNo()
+                << "  Received:" << patchInfo.size() << endl;
+        }
+
+        // Apply transform to received data for non-parallel planes
+        if (!procPatch.parallel())
+        {
+            transform(procPatch, procPatch.forwardT(), patchInfo);
+        }
+
+        // Adapt for entering domain
+        enterDomain(procPatch, patchPoints, patchInfo);
+
+        // Merge received info
+        const labelList& meshPoints = procPatch.meshPoints();
+        forAll(patchInfo, i)
+        {
+            label meshPointI = meshPoints[patchPoints[i]];
+
+            if (!allPointInfo_[meshPointI].equal(patchInfo[i], td_))
             {
-                IPstream fromNeighbour
+                updatePoint
                 (
-                    Pstream::blocking,
-                    procPatch.neighbProcNo()
+                    meshPointI,
+                    patchInfo[i],
+                    allPointInfo_[meshPointI]
                 );
-
-                fromNeighbour >> owner >> ownerIndex >> patchInfo;
             }
-
-            if (debug)
-            {
-                Pout<< "Processor patch " << patchI << ' ' << patch.name()
-                    << " communicating with " << procPatch.neighbProcNo()
-                    << "  Received:" << patchInfo.size() << endl;
-            }
-
-            // Apply transform to received data for non-parallel planes
-            if (!procPatch.parallel())
-            {
-                transform(procPatch.forwardT(), patchInfo);
-            }
-
-            updateFromPatchInfo
-            (
-                patch,
-                patch,
-                owner,
-                ownerIndex,
-                patchInfo
-            );
         }
     }
 
@@ -508,20 +411,21 @@ void Foam::PointEdgeWave<Type>::handleProcPatches()
 
     // Combine on master. Reduce operator has to handle a list and call
     // Type.updatePoint for all elements
-    combineReduce(sharedData, listUpdateOp<Type>());
+    combineReduce(sharedData, listUpdateOp<Type>(propagationTol_, td_));
 
     forAll(pd.sharedPointLabels(), i)
     {
         label meshPointI = pd.sharedPointLabels()[i];
 
-        // Retrieve my entries from the shared points
-        if (sharedData[pd.sharedPointAddr()[i]].valid())
+        // Retrieve my entries from the shared points.
+        const Type& nbrInfo = sharedData[pd.sharedPointAddr()[i]];
+
+        if (!allPointInfo_[meshPointI].equal(nbrInfo, td_))
         {
             updatePoint
             (
                 meshPointI,
-                sharedData[pd.sharedPointAddr()[i]],
-                propagationTol_,
+                nbrInfo,
                 allPointInfo_[meshPointI]
             );
         }
@@ -529,11 +433,14 @@ void Foam::PointEdgeWave<Type>::handleProcPatches()
 }
 
 
-template <class Type>
-void Foam::PointEdgeWave<Type>::handleCyclicPatches()
+template <class Type, class TrackingData>
+void Foam::PointEdgeWave<Type, TrackingData>::handleCyclicPatches()
 {
-    // 1. Send all point info on cyclic patches. Send as
-    // face label + offset in face.
+    // 1. Send all point info on cyclic patches.
+
+    DynamicList<Type> nbrInfo;
+    DynamicList<label> nbrPoints;
+    DynamicList<label> thisPoints;
 
     forAll(mesh_.boundaryMesh(), patchI)
     {
@@ -544,31 +451,44 @@ void Foam::PointEdgeWave<Type>::handleCyclicPatches()
             const cyclicPolyPatch& cycPatch =
                 refCast<const cyclicPolyPatch>(patch);
 
-            const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
+            nbrInfo.clear();
+            nbrInfo.reserve(cycPatch.nPoints());
+            nbrPoints.clear();
+            nbrPoints.reserve(cycPatch.nPoints());
+            thisPoints.clear();
+            thisPoints.reserve(cycPatch.nPoints());
 
-            DynamicList<Type> nbrInfo(nbrPatch.nPoints());
-            DynamicList<label> nbrPoints(nbrPatch.nPoints());
-            DynamicList<label> nbrOwner(nbrPatch.nPoints());
-            DynamicList<label> nbrIndex(nbrPatch.nPoints());
+            // Collect nbrPatch points that have changed
+            {
+                const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
+                const edgeList& pairs = cycPatch.coupledPoints();
+                const labelList& meshPoints = nbrPatch.meshPoints();
 
-            getChangedPatchPoints
-            (
-                nbrPatch,
-                nbrInfo,
-                nbrPoints,
-                nbrOwner,
-                nbrIndex
-            );
+                forAll(pairs, pairI)
+                {
+                    label thisPointI = pairs[pairI][0];
+                    label nbrPointI = pairs[pairI][1];
+                    label meshPointI = meshPoints[nbrPointI];
+
+                    if (changedPoint_[meshPointI])
+                    {
+                        nbrInfo.append(allPointInfo_[meshPointI]);
+                        nbrPoints.append(nbrPointI);
+                        thisPoints.append(thisPointI);
+                    }
+                }
+
+                // nbr : adapt for leaving domain
+                leaveDomain(nbrPatch, nbrPoints, nbrInfo);
+            }
 
-            // nbr : adapt for leaving domain
-            leaveDomain(nbrPatch, nbrPatch, nbrPoints, nbrInfo);
 
             // Apply rotation for non-parallel planes
 
             if (!cycPatch.parallel())
             {
                 // received data from half1
-                transform(cycPatch.forwardT(), nbrInfo);
+                transform(cycPatch, cycPatch.forwardT(), nbrInfo);
             }
 
             if (debug)
@@ -578,19 +498,24 @@ void Foam::PointEdgeWave<Type>::handleCyclicPatches()
                     << endl;
             }
 
-            // Half1: update with data from halfB
-            updateFromPatchInfo
-            (
-                cycPatch,
-                cycPatch,
-                nbrOwner,
-                nbrIndex,
-                nbrInfo
-            );
+            // Adapt for entering domain
+            enterDomain(cycPatch, thisPoints, nbrInfo);
 
-            if (debug)
+            // Merge received info
+            const labelList& meshPoints = cycPatch.meshPoints();
+            forAll(nbrInfo, i)
             {
-                //checkCyclic(patch);
+                label meshPointI = meshPoints[thisPoints[i]];
+
+                if (!allPointInfo_[meshPointI].equal(nbrInfo[i], td_))
+                {
+                    updatePoint
+                    (
+                        meshPointI,
+                        nbrInfo[i],
+                        allPointInfo_[meshPointI]
+                    );
+                }
             }
         }
     }
@@ -601,22 +526,24 @@ void Foam::PointEdgeWave<Type>::handleCyclicPatches()
 
 // Iterate, propagating changedPointsInfo across mesh, until no change (or
 // maxIter reached). Initial point values specified.
-template <class Type>
-Foam::PointEdgeWave<Type>::PointEdgeWave
+template <class Type, class TrackingData>
+Foam::PointEdgeWave<Type, TrackingData>::PointEdgeWave
 (
     const polyMesh& mesh,
     const labelList& changedPoints,
     const List<Type>& changedPointsInfo,
 
-    List<Type>& allPointInfo,
-    List<Type>& allEdgeInfo,
+    UList<Type>& allPointInfo,
+    UList<Type>& allEdgeInfo,
 
-    const label maxIter
+    const label maxIter,
+    TrackingData& td
 )
 :
     mesh_(mesh),
     allPointInfo_(allPointInfo),
     allEdgeInfo_(allEdgeInfo),
+    td_(td),
     changedPoint_(mesh_.nPoints(), false),
     changedPoints_(mesh_.nPoints()),
     nChangedPoints_(0),
@@ -632,7 +559,7 @@ Foam::PointEdgeWave<Type>::PointEdgeWave
     {
         FatalErrorIn
         (
-            "PointEdgeWave<Type>::PointEdgeWave"
+            "PointEdgeWave<Type, TrackingData>::PointEdgeWave"
             "(const polyMesh&, const labelList&, const List<Type>,"
             " List<Type>&, List<Type>&, const label maxIter)"
         )   << "size of pointInfo work array is not equal to the number"
@@ -645,7 +572,7 @@ Foam::PointEdgeWave<Type>::PointEdgeWave
     {
         FatalErrorIn
         (
-            "PointEdgeWave<Type>::PointEdgeWave"
+            "PointEdgeWave<Type, TrackingData>::PointEdgeWave"
             "(const polyMesh&, const labelList&, const List<Type>,"
             " List<Type>&, List<Type>&, const label maxIter)"
         )   << "size of edgeInfo work array is not equal to the number"
@@ -671,7 +598,7 @@ Foam::PointEdgeWave<Type>::PointEdgeWave
     {
         FatalErrorIn
         (
-            "PointEdgeWave<Type>::PointEdgeWave"
+            "PointEdgeWave<Type, TrackingData>::PointEdgeWave"
             "(const polyMesh&, const labelList&, const List<Type>,"
             " List<Type>&, List<Type>&, const label maxIter)"
         )   << "Maximum number of iterations reached. Increase maxIter." << endl
@@ -683,17 +610,19 @@ Foam::PointEdgeWave<Type>::PointEdgeWave
 }
 
 
-template <class Type>
-Foam::PointEdgeWave<Type>::PointEdgeWave
+template <class Type, class TrackingData>
+Foam::PointEdgeWave<Type, TrackingData>::PointEdgeWave
 (
     const polyMesh& mesh,
-    List<Type>& allPointInfo,
-    List<Type>& allEdgeInfo
+    UList<Type>& allPointInfo,
+    UList<Type>& allEdgeInfo,
+    TrackingData& td
 )
 :
     mesh_(mesh),
     allPointInfo_(allPointInfo),
     allEdgeInfo_(allEdgeInfo),
+    td_(td),
     changedPoint_(mesh_.nPoints(), false),
     changedPoints_(mesh_.nPoints()),
     nChangedPoints_(0),
@@ -709,31 +638,31 @@ Foam::PointEdgeWave<Type>::PointEdgeWave
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template <class Type>
-Foam::PointEdgeWave<Type>::~PointEdgeWave()
+template <class Type, class TrackingData>
+Foam::PointEdgeWave<Type, TrackingData>::~PointEdgeWave()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 
-template <class Type>
-Foam::label Foam::PointEdgeWave<Type>::getUnsetPoints() const
+template <class Type, class TrackingData>
+Foam::label Foam::PointEdgeWave<Type, TrackingData>::getUnsetPoints() const
 {
     return nUnvisitedPoints_;
 }
 
 
-template <class Type>
-Foam::label Foam::PointEdgeWave<Type>::getUnsetEdges() const
+template <class Type, class TrackingData>
+Foam::label Foam::PointEdgeWave<Type, TrackingData>::getUnsetEdges() const
 {
     return nUnvisitedEdges_;
 }
 
 
 // Copy point information into member data
-template <class Type>
-void Foam::PointEdgeWave<Type>::setPointInfo
+template <class Type, class TrackingData>
+void Foam::PointEdgeWave<Type, TrackingData>::setPointInfo
 (
     const labelList& changedPoints,
     const List<Type>& changedPointsInfo
@@ -743,13 +672,13 @@ void Foam::PointEdgeWave<Type>::setPointInfo
     {
         label pointI = changedPoints[changedPointI];
 
-        bool wasValid = allPointInfo_[pointI].valid();
+        bool wasValid = allPointInfo_[pointI].valid(td_);
 
         // Copy info for pointI
         allPointInfo_[pointI] = changedPointsInfo[changedPointI];
 
         // Maintain count of unset points
-        if (!wasValid && allPointInfo_[pointI].valid())
+        if (!wasValid && allPointInfo_[pointI].valid(td_))
         {
             --nUnvisitedPoints_;
         }
@@ -766,8 +695,8 @@ void Foam::PointEdgeWave<Type>::setPointInfo
 
 
 // Propagate information from edge to point. Return number of points changed.
-template <class Type>
-Foam::label Foam::PointEdgeWave<Type>::edgeToPoint()
+template <class Type, class TrackingData>
+Foam::label Foam::PointEdgeWave<Type, TrackingData>::edgeToPoint()
 {
     for
     (
@@ -780,7 +709,7 @@ Foam::label Foam::PointEdgeWave<Type>::edgeToPoint()
 
         if (!changedEdge_[edgeI])
         {
-            FatalErrorIn("PointEdgeWave<Type>::edgeToPoint()")
+            FatalErrorIn("PointEdgeWave<Type, TrackingData>::edgeToPoint()")
                 << "edge " << edgeI
                 << " not marked as having been changed" << nl
                 << "This might be caused by multiple occurences of the same"
@@ -797,14 +726,13 @@ Foam::label Foam::PointEdgeWave<Type>::edgeToPoint()
         {
             Type& currentWallInfo = allPointInfo_[e[eI]];
 
-            if (currentWallInfo != neighbourWallInfo)
+            if (!currentWallInfo.equal(neighbourWallInfo, td_))
             {
                 updatePoint
                 (
                     e[eI],
                     edgeI,
                     neighbourWallInfo,
-                    propagationTol_,
                     currentWallInfo
                 );
             }
@@ -843,8 +771,8 @@ Foam::label Foam::PointEdgeWave<Type>::edgeToPoint()
 
 
 // Propagate information from point to edge. Return number of edges changed.
-template <class Type>
-Foam::label Foam::PointEdgeWave<Type>::pointToEdge()
+template <class Type, class TrackingData>
+Foam::label Foam::PointEdgeWave<Type, TrackingData>::pointToEdge()
 {
     const labelListList& pointEdges = mesh_.pointEdges();
 
@@ -859,7 +787,7 @@ Foam::label Foam::PointEdgeWave<Type>::pointToEdge()
 
         if (!changedPoint_[pointI])
         {
-            FatalErrorIn("PointEdgeWave<Type>::pointToEdge()")
+            FatalErrorIn("PointEdgeWave<Type, TrackingData>::pointToEdge()")
                 << "Point " << pointI
                 << " not marked as having been changed" << nl
                 << "This might be caused by multiple occurences of the same"
@@ -877,14 +805,13 @@ Foam::label Foam::PointEdgeWave<Type>::pointToEdge()
 
             Type& currentWallInfo = allEdgeInfo_[edgeI];
 
-            if (currentWallInfo != neighbourWallInfo)
+            if (!currentWallInfo.equal(neighbourWallInfo, td_))
             {
                 updateEdge
                 (
                     edgeI,
                     pointI,
                     neighbourWallInfo,
-                    propagationTol_,
                     currentWallInfo
                 );
             }
@@ -912,8 +839,11 @@ Foam::label Foam::PointEdgeWave<Type>::pointToEdge()
 
 
 // Iterate
-template <class Type>
-Foam::label Foam::PointEdgeWave<Type>::iterate(const label maxIter)
+template <class Type, class TrackingData>
+Foam::label Foam::PointEdgeWave<Type, TrackingData>::iterate
+(
+    const label maxIter
+)
 {
     if (nCyclicPatches_ > 0)
     {
@@ -975,4 +905,5 @@ Foam::label Foam::PointEdgeWave<Type>::iterate(const label maxIter)
     return iter;
 }
 
+
 // ************************************************************************* //
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWave.H b/src/meshTools/PointEdgeWave/PointEdgeWave.H
index 9423fbbd71..c3e70db195 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/PointEdgeWave/PointEdgeWave.H
@@ -58,13 +58,9 @@ SourceFiles
 #ifndef PointEdgeWave_H
 #define PointEdgeWave_H
 
-#include "label.H"
 #include "boolList.H"
 #include "scalarField.H"
-#include "pointFields.H"
-#include "tensor.H"
-#include "primitivePatch.H"
-#include "PtrList.H"
+#include "tensorField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -73,7 +69,7 @@ namespace Foam
 
 // Forward declaration of classes
 class polyMesh;
-
+class polyPatch;
 
 /*---------------------------------------------------------------------------*\
                         Class PointEdgeWaveName Declaration
@@ -86,7 +82,7 @@ TemplateName(PointEdgeWave);
                            Class PointEdgeWave Declaration
 \*---------------------------------------------------------------------------*/
 
-template <class Type>
+template <class Type, class TrackingData = int>
 class PointEdgeWave
 :
     public PointEdgeWaveName
@@ -98,6 +94,10 @@ class PointEdgeWave
         //  up to Type implementation)
         static scalar propagationTol_;
 
+        //- Used as default trackdata value to satisfy default template
+        //  argument.
+        static label dummyTrackData_;
+
 
     // Private data
 
@@ -105,10 +105,13 @@ class PointEdgeWave
         const polyMesh& mesh_;
 
         //- Wall information for all points
-        List<Type>& allPointInfo_;
+        UList<Type>& allPointInfo_;
 
         //- Information on all mesh edges
-        List<Type>& allEdgeInfo_;
+        UList<Type>& allEdgeInfo_;
+
+        //- Additional data to be passed into container
+        TrackingData& td_;
 
         //- Has point changed
         boolList changedPoint_;
@@ -127,9 +130,6 @@ class PointEdgeWave
         //- Number of cyclic patches
         label nCyclicPatches_;
 
-        //- For every cyclic patch two primitivePatches
-        PtrList<primitivePatch> cycHalves_;
-
         //- Number of evaluations
         label nEvals_;
 
@@ -140,15 +140,10 @@ class PointEdgeWave
 
     // Private Member Functions
 
-        //- Add value to all elements of labelList
-        static void offset(const label val, labelList& elems);
-
-
         //- Adapt pointInfo for leaving domain
         void leaveDomain
         (
-            const polyPatch& meshPatch,
-            const primitivePatch& patch,
+            const polyPatch&,
             const List<label>& patchPointLabels,
             List<Type>& pointInfo
         ) const;
@@ -156,8 +151,7 @@ class PointEdgeWave
         //- Adapt pointInfo for entering domain
         void enterDomain
         (
-            const polyPatch& meshPatch,
-            const primitivePatch& patch,
+            const polyPatch&,
             const List<label>& patchPointLabels,
             List<Type>& pointInfo
         ) const;
@@ -165,6 +159,7 @@ class PointEdgeWave
         //- Transform. Implementation referred to Type
         void transform
         (
+            const polyPatch& patch,
             const tensorField& rotTensor,
             List<Type>& pointInfo
         ) const;
@@ -176,7 +171,6 @@ class PointEdgeWave
             const label pointI,
             const label neighbourEdgeI,
             const Type& neighbourInfo,
-            const scalar tol,
             Type& pointInfo
         );
 
@@ -186,7 +180,6 @@ class PointEdgeWave
         (
             const label pointI,
             const Type& neighbourInfo,
-            const scalar tol,
             Type& pointInfo
         );
 
@@ -197,7 +190,6 @@ class PointEdgeWave
             const label edgeI,
             const label neighbourPointI,
             const Type& neighbourInfo,
-            const scalar tol,
             Type& edgeInfo
         );
 
@@ -207,26 +199,6 @@ class PointEdgeWave
             template <class PatchType>
             label countPatchType() const;
 
-            //- Get info on patch points
-            void getChangedPatchPoints
-            (
-                const primitivePatch& patch,
-                DynamicList<Type>& patchInfo,
-                DynamicList<label>& patchPoints,
-                DynamicList<label>& owner,
-                DynamicList<label>& ownerIndex
-            ) const;
-
-            //- Merge data from patch into overall data
-            void updateFromPatchInfo
-            (
-                const polyPatch& meshPatch,
-                const primitivePatch& patch,
-                const labelList& owner,
-                const labelList& ownerIndex,
-                List<Type>& patchInfo
-            );
-
             //- Merge data from across processor boundaries
             void handleProcPatches();
 
@@ -270,9 +242,10 @@ public:
             const polyMesh& mesh,
             const labelList& initialPoints,
             const List<Type>& initialPointsInfo,
-            List<Type>& allPointInfo,
-            List<Type>& allEdgeInfo,
-            const label maxIter
+            UList<Type>& allPointInfo,
+            UList<Type>& allEdgeInfo,
+            const label maxIter,
+            TrackingData& td = dummyTrackData_
         );
 
         //- Construct from mesh. Use setPointInfo and iterate() to do
@@ -280,8 +253,9 @@ public:
         PointEdgeWave
         (
             const polyMesh& mesh,
-            List<Type>& allPointInfo,
-            List<Type>& allEdgeInfo
+            UList<Type>& allPointInfo,
+            UList<Type>& allEdgeInfo,
+            TrackingData& td = dummyTrackData_
         );
 
 
@@ -291,18 +265,24 @@ public:
 
     // Member Functions
 
-        //- Get allPointInfo
-        const List<Type>& allPointInfo() const
+        //- Access allPointInfo
+        UList<Type>& allPointInfo() const
         {
             return allPointInfo_;
         }
 
-        //- Get allEdgeInfo
-        const List<Type>& allEdgeInfo() const
+        //- Access allEdgeInfo
+        UList<Type>& allEdgeInfo() const
         {
             return allEdgeInfo_;
         }
 
+        //- Additional data to be passed into container
+        const TrackingData& data() const
+        {
+            return td_;
+        }
+
         //- Get number of unvisited edges, i.e. edges that were not (yet)
         //  reached from walking across mesh. This can happen from
         //  - not enough iterations done
@@ -340,19 +320,29 @@ public:
 \*---------------------------------------------------------------------------*/
 
 //- List update operation
-template <class Type>
+template <class Type, class TrackingData = int>
 class listUpdateOp
 {
+    //- Additional data to be passed into container
+
+    const scalar tol_;
+
+    TrackingData& td_;
 
 public:
+    listUpdateOp(const scalar tol, TrackingData& td)
+    :
+        tol_(tol),
+        td_(td)
+    {}
 
     void operator()(List<Type>& x, const List<Type>& y) const
     {
         forAll(x, i)
         {
-            if (y[i].valid())
+            if (y[i].valid(td_))
             {
-                x[i].updatePoint(y[i], PointEdgeWave<Type>::propagationTol());
+                x[i].updatePoint(y[i], tol_, td_);
             }
         }
     }
diff --git a/src/meshTools/PointEdgeWave/pointEdgePoint.H b/src/meshTools/PointEdgeWave/pointEdgePoint.H
index a876ab2e87..81f4019bd4 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePoint.H
+++ b/src/meshTools/PointEdgeWave/pointEdgePoint.H
@@ -73,19 +73,23 @@ class pointEdgePoint
         //- Evaluate distance to point. Update distSqr, origin from whomever
         //  is nearer pt. Return true if w2 is closer to point,
         //  false otherwise.
+        template<class TrackingData>
         inline bool update
         (
             const point&,
             const pointEdgePoint& w2,
-            const scalar tol
+            const scalar tol,
+            TrackingData& td
         );
 
         //- Combine current with w2. Update distSqr, origin if w2 has smaller
         //  quantities and returns true.
+        template<class TrackingData>
         inline bool update
         (
             const pointEdgePoint& w2,
-            const scalar tol
+            const scalar tol,
+            TrackingData& td
         );
 
 
@@ -97,7 +101,7 @@ public:
         inline pointEdgePoint();
 
         //- Construct from origin, distance
-        inline pointEdgePoint(const point& origin, const scalar distSqr);
+        inline pointEdgePoint(const point&, const scalar);
 
         //- Construct as copy
         inline pointEdgePoint(const pointEdgePoint&);
@@ -116,76 +120,102 @@ public:
 
             //- Check whether origin has been changed at all or
             //  still contains original (invalid) value.
-            inline bool valid() const;
+            template<class TrackingData>
+            inline bool valid(TrackingData& td) const;
 
             //- Check for identical geometrical data. Used for cyclics checking.
-            inline bool sameGeometry(const pointEdgePoint&, const scalar tol)
-             const;
+            template<class TrackingData>
+            inline bool sameGeometry
+            (
+                const pointEdgePoint&,
+                const scalar tol,
+                TrackingData& td
+            ) const;
 
             //- Convert origin to relative vector to leaving point
             //  (= point coordinate)
+            template<class TrackingData>
             inline void leaveDomain
             (
                 const polyPatch& patch,
                 const label patchPointI,
-                const point& pos
+                const point& pos,
+                TrackingData& td
             );
 
             //- Convert relative origin to absolute by adding entering point
+            template<class TrackingData>
             inline void enterDomain
             (
                 const polyPatch& patch,
                 const label patchPointI,
-                const point& pos
+                const point& pos,
+                TrackingData& td
             );
 
             //- Apply rotation matrix to origin
-            inline void transform(const tensor& rotTensor);
+            template<class TrackingData>
+            inline void transform
+            (
+                const tensor& rotTensor,
+                TrackingData& td
+            );
 
             //- Influence of edge on point
+            template<class TrackingData>
             inline bool updatePoint
             (
                 const polyMesh& mesh,
                 const label pointI,
                 const label edgeI,
                 const pointEdgePoint& edgeInfo,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             );
 
             //- Influence of different value on same point.
             //  Merge new and old info.
+            template<class TrackingData>
             inline bool updatePoint
             (
                 const polyMesh& mesh,
                 const label pointI,
                 const pointEdgePoint& newPointInfo,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             );
 
             //- Influence of different value on same point.
             //  No information about current position whatsoever.
+            template<class TrackingData>
             inline bool updatePoint
             (
                 const pointEdgePoint& newPointInfo,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             );
 
             //- Influence of point on edge.
+            template<class TrackingData>
             inline bool updateEdge
             (
                 const polyMesh& mesh,
                 const label edgeI,
                 const label pointI,
                 const pointEdgePoint& pointInfo,
-                const scalar tol
+                const scalar tol,
+                TrackingData& td
             );
 
+            //- Same (like operator==)
+            template<class TrackingData>
+            inline bool equal(const pointEdgePoint&, TrackingData& td) const;
+
 
     // Member Operators
 
-        //Note: Used to determine whether to call update.
+        // Needed for List IO
         inline bool operator==(const pointEdgePoint&) const;
-
         inline bool operator!=(const pointEdgePoint&) const;
 
 
diff --git a/src/meshTools/PointEdgeWave/pointEdgePointI.H b/src/meshTools/PointEdgeWave/pointEdgePointI.H
index 38247e1583..43bdd088a2 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePointI.H
+++ b/src/meshTools/PointEdgeWave/pointEdgePointI.H
@@ -29,16 +29,18 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // Update this with w2 if w2 nearer to pt.
+template<class TrackingData>
 inline bool Foam::pointEdgePoint::update
 (
     const point& pt,
     const pointEdgePoint& w2,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
     scalar dist2 = magSqr(pt - w2.origin());
 
-    if (!valid())
+    if (!valid(td))
     {
         // current not yet set so use any value
         distSqr_ = dist2;
@@ -72,13 +74,15 @@ inline bool Foam::pointEdgePoint::update
 
 
 // Update this with w2 (information on same point)
+template<class TrackingData>
 inline bool Foam::pointEdgePoint::update
 (
     const pointEdgePoint& w2,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
-    if (!valid())
+    if (!valid(td))
     {
         // current not yet set so use any value
         distSqr_ = w2.distSqr();
@@ -155,17 +159,20 @@ inline Foam::scalar Foam::pointEdgePoint::distSqr() const
 }
 
 
-inline bool Foam::pointEdgePoint::valid() const
+template<class TrackingData>
+inline bool Foam::pointEdgePoint::valid(TrackingData& td) const
 {
     return origin_ != point::max;
 }
 
 
 // Checks for cyclic points
+template<class TrackingData>
 inline bool Foam::pointEdgePoint::sameGeometry
 (
     const pointEdgePoint& w2,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 ) const
 {
     scalar diff = Foam::mag(distSqr() - w2.distSqr());
@@ -188,18 +195,25 @@ inline bool Foam::pointEdgePoint::sameGeometry
 }
 
 
+template<class TrackingData>
 inline void Foam::pointEdgePoint::leaveDomain
 (
     const polyPatch& patch,
     const label patchPointI,
-    const point& coord
+    const point& coord,
+    TrackingData& td
 )
 {
     origin_ -= coord;
 }
 
 
-inline void Foam::pointEdgePoint::transform(const tensor& rotTensor)
+template<class TrackingData>
+inline void Foam::pointEdgePoint::transform
+(
+    const tensor& rotTensor,
+    TrackingData& td
+)
 {
     origin_ = Foam::transform(rotTensor, origin_);
 }
@@ -207,11 +221,13 @@ inline void Foam::pointEdgePoint::transform(const tensor& rotTensor)
 
 // Update absolute geometric quantities. Note that distance (distSqr_)
 // is not affected by leaving/entering domain.
+template<class TrackingData>
 inline void Foam::pointEdgePoint::enterDomain
 (
     const polyPatch& patch,
     const label patchPointI,
-    const point& coord
+    const point& coord,
+    TrackingData& td
 )
 {
     // back to absolute form
@@ -220,78 +236,74 @@ inline void Foam::pointEdgePoint::enterDomain
 
 
 // Update this with information from connected edge
+template<class TrackingData>
 inline bool Foam::pointEdgePoint::updatePoint
 (
     const polyMesh& mesh,
     const label pointI,
     const label edgeI,
     const pointEdgePoint& edgeInfo,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
-    return
-        update
-        (
-            mesh.points()[pointI],
-            edgeInfo,
-            tol
-        );
+    return update(mesh.points()[pointI], edgeInfo, tol, td);
 }
 
 
 // Update this with new information on same point
+template<class TrackingData>
 inline bool Foam::pointEdgePoint::updatePoint
 (
     const polyMesh& mesh,
     const label pointI,
     const pointEdgePoint& newPointInfo,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
-    return
-        update
-        (
-            mesh.points()[pointI],
-            newPointInfo,
-            tol
-        );
+    return update(mesh.points()[pointI], newPointInfo, tol, td);
 }
 
 
 // Update this with new information on same point. No extra information.
+template<class TrackingData>
 inline bool Foam::pointEdgePoint::updatePoint
 (
     const pointEdgePoint& newPointInfo,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
-    return update(newPointInfo, tol);
+    return update(newPointInfo, tol, td);
 }
 
 
 // Update this with information from connected point
+template<class TrackingData>
 inline bool Foam::pointEdgePoint::updateEdge
 (
     const polyMesh& mesh,
     const label edgeI,
     const label pointI,
     const pointEdgePoint& pointInfo,
-    const scalar tol
+    const scalar tol,
+    TrackingData& td
 )
 {
-    const pointField& points = mesh.points();
-
     const edge& e = mesh.edges()[edgeI];
+    return update(e.centre(mesh.points()), pointInfo, tol, td);
+}
 
-    const point edgeMid(0.5*(points[e[0]] + points[e[1]]));
 
-    return
-        update
-        (
-            edgeMid,
-            pointInfo,
-            tol
-        );
+template <class TrackingData>
+inline bool Foam::pointEdgePoint::equal
+(
+    const pointEdgePoint& rhs,
+    TrackingData& td
+) const
+{
+    return operator==(rhs);
 }
 
 
diff --git a/src/meshTools/momentOfInertia/momentOfInertia.C b/src/meshTools/momentOfInertia/momentOfInertia.C
index af3265a5ec..8dc1a53d61 100644
--- a/src/meshTools/momentOfInertia/momentOfInertia.C
+++ b/src/meshTools/momentOfInertia/momentOfInertia.C
@@ -21,382 +21,328 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Class
-    momentOfInertia
-
-Description
-    Reimplementation of volInt.c by Brian Mirtich.
-        *  mirtich@cs.berkeley.edu                             *
-        *  http://www.cs.berkeley.edu/~mirtich                 *
-
--------------------------------------------------------------------------------
-*/
+\*---------------------------------------------------------------------------*/
 
 #include "momentOfInertia.H"
-//#include "pyramidPointFaceRef.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-//Foam::tensor Foam::momentOfInertia
-//(
-//    const pointField& points,
-//    const faceList& faces,
-//    const cell& cFaces,
-//    const point& cc
-//)
-//{
-//    tensor t(tensor::zero);
-//
-//    forAll(cFaces, i)
-//    {
-//        const face& f = faces[cFaces[i]];
-//
-//        scalar pyrVol = pyramidPointFaceRef(f, cc).mag(points);
-//
-//        vector pyrCentre = pyramidPointFaceRef(f, cc).centre(points);
-//
-//        vector d = pyrCentre - cc;
-//
-//        t.xx() += pyrVol*(sqr(d.y()) + sqr(d.z()));
-//        t.yy() += pyrVol*(sqr(d.x()) + sqr(d.z()));
-//        t.zz() += pyrVol*(sqr(d.x()) + sqr(d.y()));
-//
-//        t.xy() -= pyrVol*d.x()*d.y();
-//        t.xz() -= pyrVol*d.x()*d.z();
-//        t.yz() -= pyrVol*d.y()*d.z();
-//    }
-//
-//    // Symmetric
-//    t.yx() = t.xy();
-//    t.zx() = t.xz();
-//    t.zy() = t.yz();
-//
-//    return t;
-//}
-
-
-#define sqr(x) ((x)*(x))
-#define pow3(x) ((x)*(x)*(x))
-
-// compute various integrations over projection of face
-void Foam::compProjectionIntegrals
+void Foam::momentOfInertia::massPropertiesSolid
 (
-    const pointField& points,
-    const face& f,
-    const direction A,
-    const direction B,
-
-    scalar& P1,
-    scalar& Pa,
-    scalar& Pb,
-    scalar& Paa,
-    scalar& Pab,
-    scalar& Pbb,
-    scalar& Paaa,
-    scalar& Paab,
-    scalar& Pabb,
-    scalar& Pbbb
-)
-{
-    P1 = Pa = Pb = Paa = Pab = Pbb = Paaa = Paab = Pabb = Pbbb = 0.0;
-
-    forAll(f, i)
-    {
-        scalar a0 = points[f[i]][A];
-        scalar b0 = points[f[i]][B];
-        scalar a1 = points[f[(i+1) % f.size()]][A];
-        scalar b1 = points[f[(i+1) % f.size()]][B];
-        scalar da = a1 - a0;
-        scalar db = b1 - b0;
-
-        scalar a0_2 = a0 * a0;
-        scalar a0_3 = a0_2 * a0;
-        scalar a0_4 = a0_3 * a0;
-
-        scalar b0_2 = b0 * b0;
-        scalar b0_3 = b0_2 * b0;
-        scalar b0_4 = b0_3 * b0;
-
-        scalar a1_2 = a1 * a1;
-        scalar a1_3 = a1_2 * a1;
-
-        scalar b1_2 = b1 * b1;
-        scalar b1_3 = b1_2 * b1;
-
-        scalar C1 = a1 + a0;
-
-        scalar Ca = a1*C1 + a0_2;
-        scalar Caa = a1*Ca + a0_3;
-        scalar Caaa = a1*Caa + a0_4;
-
-        scalar Cb = b1*(b1 + b0) + b0_2;
-        scalar Cbb = b1*Cb + b0_3;
-        scalar Cbbb = b1*Cbb + b0_4;
-
-        scalar Cab = 3*a1_2 + 2*a1*a0 + a0_2;
-        scalar Kab = a1_2 + 2*a1*a0 + 3*a0_2;
-
-        scalar Caab = a0*Cab + 4*a1_3;
-        scalar Kaab = a1*Kab + 4*a0_3;
-
-        scalar Cabb = 4*b1_3 + 3*b1_2*b0 + 2*b1*b0_2 + b0_3;
-        scalar Kabb = b1_3 + 2*b1_2*b0 + 3*b1*b0_2 + 4*b0_3;
-
-        P1 += db*C1;
-        Pa += db*Ca;
-        Paa += db*Caa;
-        Paaa += db*Caaa;
-        Pb += da*Cb;
-        Pbb += da*Cbb;
-        Pbbb += da*Cbbb;
-        Pab += db*(b1*Cab + b0*Kab);
-        Paab += db*(b1*Caab + b0*Kaab);
-        Pabb += da*(a1*Cabb + a0*Kabb);
-  }
-
-  P1 /= 2.0;
-  Pa /= 6.0;
-  Paa /= 12.0;
-  Paaa /= 20.0;
-  Pb /= -6.0;
-  Pbb /= -12.0;
-  Pbbb /= -20.0;
-  Pab /= 24.0;
-  Paab /= 60.0;
-  Pabb /= -60.0;
-}
-
-
-void Foam::compFaceIntegrals
-(
-    const pointField& points,
-    const face& f,
-    const vector& n,
-    const scalar w,
-    const direction A,
-    const direction B,
-    const direction C,
-
-    scalar& Fa,
-    scalar& Fb,
-    scalar& Fc,
-    scalar& Faa,
-    scalar& Fbb,
-    scalar& Fcc,
-    scalar& Faaa,
-    scalar& Fbbb,
-    scalar& Fccc,
-    scalar& Faab,
-    scalar& Fbbc,
-    scalar& Fcca
-)
-{
-    scalar P1, Pa, Pb, Paa, Pab, Pbb, Paaa, Paab, Pabb, Pbbb;
-
-    compProjectionIntegrals
-    (
-        points,
-        f,
-        A,
-        B,
-
-        P1,
-        Pa,
-        Pb,
-        Paa,
-        Pab,
-        Pbb,
-        Paaa,
-        Paab,
-        Pabb,
-        Pbbb
-    );
-
-    scalar k1 = 1 / n[C];
-    scalar k2 = k1 * k1;
-    scalar k3 = k2 * k1;
-    scalar k4 = k3 * k1;
-
-    Fa = k1 * Pa;
-    Fb = k1 * Pb;
-    Fc = -k2 * (n[A]*Pa + n[B]*Pb + w*P1);
-
-    Faa = k1 * Paa;
-    Fbb = k1 * Pbb;
-    Fcc = k3 * (sqr(n[A])*Paa + 2*n[A]*n[B]*Pab + sqr(n[B])*Pbb
-         + w*(2*(n[A]*Pa + n[B]*Pb) + w*P1));
-
-    Faaa = k1 * Paaa;
-    Fbbb = k1 * Pbbb;
-    Fccc = -k4 * (pow3(n[A])*Paaa + 3*sqr(n[A])*n[B]*Paab
-           + 3*n[A]*sqr(n[B])*Pabb + pow3(n[B])*Pbbb
-           + 3*w*(sqr(n[A])*Paa + 2*n[A]*n[B]*Pab + sqr(n[B])*Pbb)
-           + w*w*(3*(n[A]*Pa + n[B]*Pb) + w*P1));
-
-    Faab = k1 * Paab;
-    Fbbc = -k2 * (n[A]*Pabb + n[B]*Pbbb + w*Pbb);
-    Fcca = k3 * (sqr(n[A])*Paaa + 2*n[A]*n[B]*Paab + sqr(n[B])*Pabb
-         + w*(2*(n[A]*Paa + n[B]*Pab) + w*Pa));
-}
-
-
-void Foam::compVolumeIntegrals
-(
-    const pointField& points,
-    const faceList& faces,
-    const cell& cFaces,
-    const vectorField& fNorm,
-    const scalarField& fW,
-
-    scalar& T0,
-    vector& T1,
-    vector& T2,
-    vector& TP
-)
-{
-    T0 = 0;
-    T1 = vector::zero;
-    T2 = vector::zero;
-    TP = vector::zero;
-
-    forAll(cFaces, i)
-    {
-        const vector& n = fNorm[i];
-
-        scalar nx = mag(n[0]);
-        scalar ny = mag(n[1]);
-        scalar nz = mag(n[2]);
-
-        direction A, B, C;
-
-        if (nx > ny && nx > nz)
-        {
-            C = 0;
-        }
-        else
-        {
-            C = (ny > nz) ? 1 : 2;
-        }
-
-        A = (C + 1) % 3;
-        B = (A + 1) % 3;
-
-        scalar Fa, Fb, Fc, Faa, Fbb, Fcc, Faaa, Fbbb, Fccc, Faab, Fbbc, Fcca;
-        compFaceIntegrals
-        (
-            points,
-            faces[cFaces[i]],
-            n,
-            fW[i],
-            A,
-            B,
-            C,
-
-            Fa,
-            Fb,
-            Fc,
-            Faa,
-            Fbb,
-            Fcc,
-            Faaa,
-            Fbbb,
-            Fccc,
-            Faab,
-            Fbbc,
-            Fcca
-        );
-
-        T0 += n[0] * ((A == 0) ? Fa : ((B == 0) ? Fb : Fc));
-
-        T1[A] += n[A] * Faa;
-        T1[B] += n[B] * Fbb;
-        T1[C] += n[C] * Fcc;
-
-        T2[A] += n[A] * Faaa;
-        T2[B] += n[B] * Fbbb;
-        T2[C] += n[C] * Fccc;
-
-        TP[A] += n[A] * Faab;
-        TP[B] += n[B] * Fbbc;
-        TP[C] += n[C] * Fcca;
-    }
-
-    T1 /= 2;
-    T2 /= 3;
-    TP /= 2;
-}
-
-
-// Calculate
-// - r: centre of mass
-// - J: inertia around origin (point 0,0,0)
-void Foam::momentOfIntertia
-(
-    const pointField& points,
-    const faceList& faces,
-    const cell& cFaces,
-    point& r,
+    const pointField& pts,
+    const triFaceList& triFaces,
+    scalar density,
+    scalar& mass,
+    vector& cM,
     tensor& J
 )
 {
-    // Face normals
-    vectorField fNorm(cFaces.size());
-    scalarField fW(cFaces.size());
+    // Reimplemented from: Wm4PolyhedralMassProperties.cpp
+    // File Version: 4.10.0 (2009/11/18)
 
-    forAll(cFaces, i)
+    // Geometric Tools, LC
+    // Copyright (c) 1998-2010
+    // Distributed under the Boost Software License, Version 1.0.
+    // http://www.boost.org/LICENSE_1_0.txt
+    // http://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
+
+    // Boost Software License - Version 1.0 - August 17th, 2003
+
+    // Permission is hereby granted, free of charge, to any person or
+    // organization obtaining a copy of the software and accompanying
+    // documentation covered by this license (the "Software") to use,
+    // reproduce, display, distribute, execute, and transmit the
+    // Software, and to prepare derivative works of the Software, and
+    // to permit third-parties to whom the Software is furnished to do
+    // so, all subject to the following:
+
+    // The copyright notices in the Software and this entire
+    // statement, including the above license grant, this restriction
+    // and the following disclaimer, must be included in all copies of
+    // the Software, in whole or in part, and all derivative works of
+    // the Software, unless such copies or derivative works are solely
+    // in the form of machine-executable object code generated by a
+    // source language processor.
+
+    // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    // OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
+    // NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+    // ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR
+    // OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+    // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+    // USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    const scalar r6 = 1.0/6.0;
+    const scalar r24 = 1.0/24.0;
+    const scalar r60 = 1.0/60.0;
+    const scalar r120 = 1.0/120.0;
+
+    // order:  1, x, y, z, x^2, y^2, z^2, xy, yz, zx
+    scalarField integrals(10, 0.0);
+
+    forAll(triFaces, i)
     {
-        label faceI = cFaces[i];
+        const triFace& tri(triFaces[i]);
 
-        const face& f = faces[faceI];
+        // vertices of triangle i
+        vector v0 = pts[tri[0]];
+        vector v1 = pts[tri[1]];
+        vector v2 = pts[tri[2]];
 
-        fNorm[i] = f.normal(points);
-        fNorm[i] /= mag(fNorm[i]) + VSMALL;
+        // cross product of edges
+        vector eA = v1 - v0;
+        vector eB = v2 - v0;
+        vector n = eA ^ eB;
 
-        fW[i] = - (fNorm[i] & points[f[0]]);
+        // compute integral terms
+        scalar tmp0, tmp1, tmp2;
+
+        scalar f1x, f2x, f3x, g0x, g1x, g2x;
+
+        tmp0 = v0.x() + v1.x();
+        f1x = tmp0 + v2.x();
+        tmp1 = v0.x()*v0.x();
+        tmp2 = tmp1 + v1.x()*tmp0;
+        f2x = tmp2 + v2.x()*f1x;
+        f3x = v0.x()*tmp1 + v1.x()*tmp2 + v2.x()*f2x;
+        g0x = f2x + v0.x()*(f1x + v0.x());
+        g1x = f2x + v1.x()*(f1x + v1.x());
+        g2x = f2x + v2.x()*(f1x + v2.x());
+
+        scalar f1y, f2y, f3y, g0y, g1y, g2y;
+
+        tmp0 = v0.y() + v1.y();
+        f1y = tmp0 + v2.y();
+        tmp1 = v0.y()*v0.y();
+        tmp2 = tmp1 + v1.y()*tmp0;
+        f2y = tmp2 + v2.y()*f1y;
+        f3y = v0.y()*tmp1 + v1.y()*tmp2 + v2.y()*f2y;
+        g0y = f2y + v0.y()*(f1y + v0.y());
+        g1y = f2y + v1.y()*(f1y + v1.y());
+        g2y = f2y + v2.y()*(f1y + v2.y());
+
+        scalar f1z, f2z, f3z, g0z, g1z, g2z;
+
+        tmp0 = v0.z() + v1.z();
+        f1z = tmp0 + v2.z();
+        tmp1 = v0.z()*v0.z();
+        tmp2 = tmp1 + v1.z()*tmp0;
+        f2z = tmp2 + v2.z()*f1z;
+        f3z = v0.z()*tmp1 + v1.z()*tmp2 + v2.z()*f2z;
+        g0z = f2z + v0.z()*(f1z + v0.z());
+        g1z = f2z + v1.z()*(f1z + v1.z());
+        g2z = f2z + v2.z()*(f1z + v2.z());
+
+        // update integrals
+        integrals[0] += n.x()*f1x;
+        integrals[1] += n.x()*f2x;
+        integrals[2] += n.y()*f2y;
+        integrals[3] += n.z()*f2z;
+        integrals[4] += n.x()*f3x;
+        integrals[5] += n.y()*f3y;
+        integrals[6] += n.z()*f3z;
+        integrals[7] += n.x()*(v0.y()*g0x + v1.y()*g1x + v2.y()*g2x);
+        integrals[8] += n.y()*(v0.z()*g0y + v1.z()*g1y + v2.z()*g2y);
+        integrals[9] += n.z()*(v0.x()*g0z + v1.x()*g1z + v2.x()*g2z);
     }
 
+    integrals[0] *= r6;
+    integrals[1] *= r24;
+    integrals[2] *= r24;
+    integrals[3] *= r24;
+    integrals[4] *= r60;
+    integrals[5] *= r60;
+    integrals[6] *= r60;
+    integrals[7] *= r120;
+    integrals[8] *= r120;
+    integrals[9] *= r120;
 
-    scalar T0;
-    vector T1, T2, TP;
+    // mass
+    mass = integrals[0];
 
-    compVolumeIntegrals
-    (
-        points,
-        faces,
-        cFaces,
-        fNorm,
-        fW,
+    // center of mass
+    cM = vector(integrals[1], integrals[2], integrals[3])/mass;
 
-        T0,
-        T1,
-        T2,
-        TP
-    );
+    // inertia relative to origin
+    J.xx() = integrals[5] + integrals[6];
+    J.xy() = -integrals[7];
+    J.xz() = -integrals[9];
+    J.yx() = J.xy();
+    J.yy() = integrals[4] + integrals[6];
+    J.yz() = -integrals[8];
+    J.zx() = J.xz();
+    J.zy() = J.yz();
+    J.zz() = integrals[4] + integrals[5];
 
-    const scalar density = 1.0;  /* assume unit density */
+    // inertia relative to center of mass
+    J -= mass*((cM & cM)*I - cM*cM);
 
-    scalar mass = density * T0;
-
-    /* compute center of mass */
-    r = T1 / T0;
-
-    /* compute inertia tensor */
-    J.xx() = density * (T2[1] + T2[2]);
-    J.yy() = density * (T2[2] + T2[0]);
-    J.zz() = density * (T2[0] + T2[1]);
-    J.xy() = J.yx() = - density * TP[0];
-    J.yz() = J.zy() = - density * TP[1];
-    J.zx() = J.xz() = - density * TP[2];
-
-    ///* translate inertia tensor to center of mass */
-    //J[XX] -= mass * (r[1]*r[1] + r[2]*r[2]);
-    //J[YY] -= mass * (r[2]*r[2] + r[0]*r[0]);
-    //J[ZZ] -= mass * (r[0]*r[0] + r[1]*r[1]);
-    //J[XY] = J[YX] += mass * r[0] * r[1];
-    //J[YZ] = J[ZY] += mass * r[1] * r[2];
-    //J[ZX] = J[XZ] += mass * r[2] * r[0];
+    // Apply density
+    mass *= density;
+    J *= density;
 }
 
 
+void Foam::momentOfInertia::massPropertiesShell
+(
+    const pointField& pts,
+    const triFaceList& triFaces,
+    scalar density,
+    scalar& mass,
+    vector& cM,
+    tensor& J
+)
+{
+    // Reset properties for accumulation
+
+    mass = 0.0;
+    cM = vector::zero;
+    J = tensor::zero;
+
+    // Find centre of mass
+
+    forAll(triFaces, i)
+    {
+        const triFace& tri(triFaces[i]);
+
+        triPointRef t
+        (
+            pts[tri[0]],
+            pts[tri[1]],
+            pts[tri[2]]
+        );
+
+        scalar triMag = t.mag();
+
+        cM +=  triMag*t.centre();
+
+        mass += triMag;
+    }
+
+    cM /= mass;
+
+    mass *= density;
+
+    // Find inertia around centre of mass
+
+    forAll(triFaces, i)
+    {
+        const triFace& tri(triFaces[i]);
+
+        J += triPointRef
+        (
+            pts[tri[0]],
+            pts[tri[1]],
+            pts[tri[2]]
+        ).inertia(cM, density);
+    }
+}
+
+
+void Foam::momentOfInertia::massPropertiesSolid
+(
+    const triSurface& surf,
+    scalar density,
+    scalar& mass,
+    vector& cM,
+    tensor& J
+)
+{
+    triFaceList faces(surf.size());
+
+    forAll(surf, i)
+    {
+        faces[i] = triFace(surf[i]);
+    }
+
+    massPropertiesSolid(surf.points(), faces, density, mass, cM, J);
+}
+
+
+void Foam::momentOfInertia::massPropertiesShell
+(
+    const triSurface& surf,
+    scalar density,
+    scalar& mass,
+    vector& cM,
+    tensor& J
+)
+{
+    triFaceList faces(surf.size());
+
+    forAll(surf, i)
+    {
+        faces[i] = triFace(surf[i]);
+    }
+
+    massPropertiesShell(surf.points(), faces, density, mass, cM, J);
+}
+
+
+Foam::tensor Foam::momentOfInertia::applyParallelAxisTheorem
+(
+    scalar mass,
+    const vector& cM,
+    const tensor& J,
+    const vector& refPt
+)
+{
+    // The displacement vector (refPt = cM) is the displacement of the
+    // new reference point from the centre of mass of the body that
+    // the inertia tensor applies to.
+
+    vector d = (refPt - cM);
+
+    return J + mass*((d & d)*I - d*d);
+}
+
+
+Foam::tmp<Foam::tensorField> Foam::momentOfInertia::meshInertia
+(
+    const polyMesh& mesh
+)
+{
+    tmp<tensorField> tTf = tmp<tensorField>(new tensorField(mesh.nCells()));
+
+    tensorField& tf = tTf();
+
+    forAll(tf, cI)
+    {
+        tf[cI] = meshInertia(mesh, cI);
+    }
+
+    return tTf;
+}
+
+
+Foam::tensor Foam::momentOfInertia::meshInertia
+(
+    const polyMesh& mesh,
+    label cellI
+)
+{
+    List<tetIndices> cellTets = polyMeshTetDecomposition::cellTetIndices
+    (
+        mesh,
+        cellI
+    );
+
+    triFaceList faces(cellTets.size());
+
+    forAll(cellTets, cTI)
+    {
+        faces[cTI] = cellTets[cTI].faceTriIs(mesh);
+    }
+
+    scalar m = 0.0;
+    vector cM = vector::zero;
+    tensor J = tensor::zero;
+
+    massPropertiesSolid(mesh.points(), faces, 1.0, m, cM, J);
+
+    return J;
+}
+
 
 // ************************************************************************* //
diff --git a/src/meshTools/momentOfInertia/momentOfInertia.H b/src/meshTools/momentOfInertia/momentOfInertia.H
index 8ff6209f0b..bb5ffef6a8 100644
--- a/src/meshTools/momentOfInertia/momentOfInertia.H
+++ b/src/meshTools/momentOfInertia/momentOfInertia.H
@@ -25,6 +25,9 @@ Class
     momentOfInertia
 
 Description
+    Calculates the inertia tensor and principal axes and moments of a
+    polyhedra/cells/triSurfaces.  Inertia can either be of the solid body or
+    of a thin shell.
 
 SourceFiles
     momentOfInertia.H
@@ -34,34 +37,86 @@ SourceFiles
 #ifndef momentOfInertia_H
 #define momentOfInertia_H
 
-#include "tensor.H"
-#include "primitiveMesh.H"
+#include "tetPointRef.H"
+#include "triFaceList.H"
+#include "triSurface.H"
+#include "polyMesh.H"
+#include "polyMeshTetDecomposition.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-////- Moment of inertia around cell centre for single cell.
-//tensor momentOfInertia
-//(
-//    const pointField&,
-//    const faceList&,
-//    const cell&,
-//    const point& cc
-//);
+/*---------------------------------------------------------------------------*\
+                     Class momentOfInertia Declaration
+\*---------------------------------------------------------------------------*/
+
+class momentOfInertia
+{
+
+public:
+
+    static void massPropertiesSolid
+    (
+        const pointField& pts,
+        const triFaceList& triFaces,
+        scalar density,
+        scalar& mass,
+        vector& cM,
+        tensor& J
+    );
+
+    static void massPropertiesShell
+    (
+        const pointField& pts,
+        const triFaceList& triFaces,
+        scalar density,
+        scalar& mass,
+        vector& cM,
+        tensor& J
+    );
+
+    static void massPropertiesSolid
+    (
+        const triSurface& surf,
+        scalar density,
+        scalar& mass,
+        vector& cM,
+        tensor& J
+    );
+
+    static void massPropertiesShell
+    (
+        const triSurface& surf,
+        scalar density,
+        scalar& mass,
+        vector& cM,
+        tensor& J
+    );
+
+    static tensor applyParallelAxisTheorem
+    (
+        scalar mass,
+        const vector& cM,
+        const tensor& J,
+        const vector& refPt
+    );
+
+    // Calculate the inertia tensor for all cells in the mesh
+    static tmp<tensorField> meshInertia
+    (
+        const polyMesh& mesh
+    );
+
+    // Calculate the inertia tensor the given cell
+    static tensor meshInertia
+    (
+        const polyMesh& mesh,
+        label cellI
+    );
+};
 
-// Calculate
-// - centre of mass
-// - inertia tensor around (0,0,0)
-void momentOfIntertia
-(
-    const pointField&,
-    const faceList&,
-    const cell&,
-    point& r,
-    tensor& Jorigin
-);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/octree/treeBoundBox.C b/src/meshTools/octree/treeBoundBox.C
index 8906affeaa..9499e53b0e 100644
--- a/src/meshTools/octree/treeBoundBox.C
+++ b/src/meshTools/octree/treeBoundBox.C
@@ -192,15 +192,19 @@ Foam::treeBoundBox::treeBoundBox(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::pointField Foam::treeBoundBox::points() const
+Foam::tmp<Foam::pointField> Foam::treeBoundBox::points() const
 {
-    pointField points(8);
+    tmp<pointField> tPts = tmp<pointField>(new pointField(8));
+
+    pointField& points = tPts();
+
     forAll(points, octant)
     {
         points[octant] = corner(octant);
 
     }
-    return points;
+
+    return tPts;
 }
 
 
diff --git a/src/meshTools/octree/treeBoundBox.H b/src/meshTools/octree/treeBoundBox.H
index f462c719ae..824a9d4b5f 100644
--- a/src/meshTools/octree/treeBoundBox.H
+++ b/src/meshTools/octree/treeBoundBox.H
@@ -191,7 +191,7 @@ public:
             inline scalar typDim() const;
 
             //- vertex coordinates. In octant coding.
-            pointField points() const;
+            tmp<pointField> points() const;
 
 
         // Check
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
index 9685fd0d2e..e14b11200b 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
@@ -45,6 +45,7 @@ Foam::scalar Foam::streamLineParticle::calcSubCycleDeltaT
 ) const
 {
     streamLineParticle testParticle(*this);
+
     bool oldKeepParticle = td.keepParticle;
     bool oldSwitchProcessor = td.switchProcessor;
     scalar fraction = testParticle.trackToFace(position()+dt*U, td);
@@ -196,9 +197,7 @@ bool Foam::streamLineParticle::move
         // Cross cell in steps:
         // - at subiter 0 calculate dt to cross cell in nSubCycle steps
         // - at the last subiter do all of the remaining track
-        // - do a few more subiters than nSubCycle since velocity might
-        //   be decreasing
-        for (label subIter = 0; subIter < 2*td.nSubCycle_; subIter++)
+        for (label subIter = 0; subIter < td.nSubCycle_; subIter++)
         {
             --lifeTime_;
 
@@ -217,14 +216,14 @@ bool Foam::streamLineParticle::move
                 // Adapt dt to cross cell in a few steps
                 dt = calcSubCycleDeltaT(td, dt, U);
             }
-            else if (subIter == td.nSubCycle_-1)
+            else if (subIter == td.nSubCycle_ - 1)
             {
                 // Do full step on last subcycle
                 dt = min(dtMax, tEnd);
             }
 
 
-            scalar fraction = trackToFace(position()+dt*U, td);
+            scalar fraction = trackToFace(position() + dt*U, td);
             dt *= fraction;
 
             tEnd -= dt;
@@ -236,7 +235,13 @@ bool Foam::streamLineParticle::move
                 lifeTime_ = 0;
             }
 
-            if (!td.keepParticle || td.switchProcessor || lifeTime_ == 0)
+            if
+            (
+                face() != -1
+            || !td.keepParticle
+            ||  td.switchProcessor
+            ||  lifeTime_ == 0
+            )
             {
                 break;
             }
diff --git a/src/turbulenceModels/LES/LESdeltas/Make/files b/src/turbulenceModels/LES/LESdeltas/Make/files
index b7d627cb48..b150cc4996 100644
--- a/src/turbulenceModels/LES/LESdeltas/Make/files
+++ b/src/turbulenceModels/LES/LESdeltas/Make/files
@@ -2,6 +2,6 @@ LESdelta/LESdelta.C
 cubeRootVolDelta/cubeRootVolDelta.C
 PrandtlDelta/PrandtlDelta.C
 smoothDelta/smoothDelta.C
-maxhxhyhzDelta/maxhxhyhzDelta.C
+maxDeltaxyz/maxDeltaxyz.C
 
 LIB = $(FOAM_LIBBIN)/libLESdeltas
diff --git a/src/turbulenceModels/LES/LESdeltas/maxhxhyhzDelta/maxhxhyhzDelta.C b/src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
similarity index 90%
rename from src/turbulenceModels/LES/LESdeltas/maxhxhyhzDelta/maxhxhyhzDelta.C
rename to src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
index 0ba1d63b1a..f3c7166fb0 100644
--- a/src/turbulenceModels/LES/LESdeltas/maxhxhyhzDelta/maxhxhyhzDelta.C
+++ b/src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "maxhxhyhzDelta.H"
+#include "maxDeltaxyz.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -33,12 +33,12 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(maxhxhyhzDelta, 0);
-addToRunTimeSelectionTable(LESdelta, maxhxhyhzDelta, dictionary);
+defineTypeNameAndDebug(maxDeltaxyz, 0);
+addToRunTimeSelectionTable(LESdelta, maxDeltaxyz, dictionary);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void maxhxhyhzDelta::calcDelta()
+void maxDeltaxyz::calcDelta()
 {
     label nD = mesh().nGeometricD();
 
@@ -86,7 +86,7 @@ void maxhxhyhzDelta::calcDelta()
     }
     else if (nD == 2)
     {
-        WarningIn("maxhxhyhzDelta::calcDelta()")
+        WarningIn("maxDeltaxyz::calcDelta()")
             << "Case is 2D, LES is not strictly applicable\n"
             << endl;
 
@@ -94,7 +94,7 @@ void maxhxhyhzDelta::calcDelta()
     }
     else
     {
-        FatalErrorIn("maxhxhyhzDelta::calcDelta()")
+        FatalErrorIn("maxDeltaxyz::calcDelta()")
             << "Case is not 3D or 2D, LES is not applicable"
             << exit(FatalError);
     }
@@ -103,7 +103,7 @@ void maxhxhyhzDelta::calcDelta()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-maxhxhyhzDelta::maxhxhyhzDelta
+maxDeltaxyz::maxDeltaxyz
 (
     const word& name,
     const fvMesh& mesh,
@@ -119,14 +119,14 @@ maxhxhyhzDelta::maxhxhyhzDelta
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void maxhxhyhzDelta::read(const dictionary& dd)
+void maxDeltaxyz::read(const dictionary& dd)
 {
     dd.subDict(type() + "Coeffs").lookup("deltaCoeff") >> deltaCoeff_;
     calcDelta();
 }
 
 
-void maxhxhyhzDelta::correct()
+void maxDeltaxyz::correct()
 {
     if (mesh_.changing())
     {
diff --git a/src/turbulenceModels/LES/LESdeltas/maxhxhyhzDelta/maxhxhyhzDelta.H b/src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
similarity index 85%
rename from src/turbulenceModels/LES/LESdeltas/maxhxhyhzDelta/maxhxhyhzDelta.H
rename to src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
index 30f26e6bd0..8ca13b4f71 100644
--- a/src/turbulenceModels/LES/LESdeltas/maxhxhyhzDelta/maxhxhyhzDelta.H
+++ b/src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
@@ -22,20 +22,20 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::maxhxhyhzDelta
+    Foam::maxDeltaxyz
 
 Description
-    maxhxhyhzDelta takes the maximum of the three dimensions per cell:
+    maxDeltaxyz takes the maximum of the three dimensions per cell:
     max(hx, hy, hz). Valid for structures hexahedral cells only.
 
 
 SourceFiles
-    maxhxhyhzDelta.C
+    maxDeltaxyz.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef maxhxhyhzDeltaDelta_H
-#define maxhxhyhzDeltaDelta_H
+#ifndef maxDeltaxyzDelta_H
+#define maxDeltaxyzDelta_H
 
 #include "LESdelta.H"
 
@@ -45,10 +45,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class maxhxhyhzDelta Declaration
+                           Class maxDeltaxyz Declaration
 \*---------------------------------------------------------------------------*/
 
-class maxhxhyhzDelta
+class maxDeltaxyz
 :
     public LESdelta
 {
@@ -60,8 +60,8 @@ class maxhxhyhzDelta
     // Private Member Functions
 
         //- Disallow default bitwise copy construct and assignment
-        maxhxhyhzDelta(const maxhxhyhzDelta&);
-        void operator=(const maxhxhyhzDelta&);
+        maxDeltaxyz(const maxDeltaxyz&);
+        void operator=(const maxDeltaxyz&);
 
         // Calculate the delta values
         void calcDelta();
@@ -70,13 +70,13 @@ class maxhxhyhzDelta
 public:
 
     //- Runtime type information
-    TypeName("maxhxhyhzDelta");
+    TypeName("maxDeltaxyz");
 
 
     // Constructors
 
         //- Construct from name, mesh and IOdictionary
-        maxhxhyhzDelta
+        maxDeltaxyz
         (
             const word& name,
             const fvMesh& mesh,
@@ -85,7 +85,7 @@ public:
 
 
     //- Destructor
-    virtual ~maxhxhyhzDelta()
+    virtual ~maxDeltaxyz()
     {}
 
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
index 764772f38e..d5fb42ebd9 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,epsilon) Gauss upwind;
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
index 55f535ac70..112f82d2ed 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,T)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
index 6d1f2f881c..7140f0ae69 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,epsilon) Gauss upwind;
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
index b0ecc3706b..173a0ce47a 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phi,U)      Gauss limitedLinearV 1;
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
index ba8d982de2..95136217a3 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,U)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 
     div(-phi,Ua)    Gauss upwind;
     div((nuEff*dev(grad(Ua).T()))) Gauss linear;
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
index 7e835feb83..c4011a71ed 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,epsilon) Gauss linear;
     div(phi,R)      Gauss linear;
     div(phi,nuTilda) Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
index 7e835feb83..c4011a71ed 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,epsilon) Gauss linear;
     div(phi,R)      Gauss linear;
     div(phi,nuTilda) Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes
index b4b59b6c27..74f1565e60 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phi,omega)  Gauss linear;
     div(phi,R)      Gauss linear;
     div(phi,nuTilda) Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/channelFoam/channel395/system/fvSchemes b/tutorials/incompressible/channelFoam/channel395/system/fvSchemes
index d0df82c153..9e124d99df 100644
--- a/tutorials/incompressible/channelFoam/channel395/system/fvSchemes
+++ b/tutorials/incompressible/channelFoam/channel395/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(B)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
index 7f5096b709..a2f31f5e87 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
index b5c7a16ad4..f5b6b3d915 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,U)      Gauss linearUpwind grad(U);
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,omega)  Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
index 808f6279a5..2d493543e9 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,U)      Gauss linearUpwind grad(U);
     div(phi,k)      Gauss upwind;
     div(phi,omega)  Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSchemes b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSchemes
index b1c95ec3b2..9664d38c53 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,R)      Gauss limitedLinear 1;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes
index b1c95ec3b2..9664d38c53 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,R)      Gauss limitedLinear 1;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
index 9baa5bc274..d6292d8089 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(phi,nuTilda) Gauss limitedLinear 1;
     div(B)          Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
index c2856acf2e..920abf4ff3 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(phi,nuTilda) Gauss limitedLinear 1;
     div(B)          Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
index b1c95ec3b2..9664d38c53 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,R)      Gauss limitedLinear 1;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
index 4a9b0c1440..2dc6cd1330 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -30,7 +30,7 @@ gradSchemes
 divSchemes
 {
     div(phi,U)      Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
 }
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
index 4a9b0c1440..2dc6cd1330 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
@@ -30,7 +30,7 @@ gradSchemes
 divSchemes
 {
     div(phi,U)      Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
 }
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
index d5c9bc3261..74a0e5bc10 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss linearUpwind Gauss linear;
     div(phi,nuTilda) Gauss linearUpwind Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
index 5487837afc..79fd21bad2 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,U)      Gauss linearUpwind grad(U);
     div(phi,k)      Gauss upwind;
     div(phi,omega)  Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
index a8972de9c2..124240f261 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/U b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/U
index f23d0ce783..601a696b75 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/U
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/U
@@ -46,13 +46,15 @@ boundaryField
 
     "terrain_.*"
     {
-        type            fixedValue;
+        type            uniformFixedValue;
+        uniformValue    (0 0 0);
         value           uniform (0 0 0);
     }
 
     ground
     {
-        type            fixedValue;
+        type            uniformFixedValue;
+        uniformValue    (0 0 0);
         value           uniform (0 0 0);
     }
 
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/epsilon b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/epsilon
index a49793464e..2cbcbd2268 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/epsilon
@@ -23,7 +23,7 @@ internalField   uniform $turbulentEpsilon;
 
 boundaryField
 {
-     #include "include/ABLConditions"
+    #include "include/ABLConditions"
 
     "terrain_.*"
     {
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/k b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/k
index b42f64236c..79b7c087e8 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/k
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/k
@@ -32,8 +32,9 @@ boundaryField
     }
     inlet
     {
-        type            fixedValue;
-        value           uniform $turbulentKE;
+        type            uniformFixedValue;
+        uniformValue    $turbulentKE;
+        value           $turbulentKE;
     }
     "terrain_.*"
     {
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p
index 1449474a5e..add79aad34 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p
@@ -29,8 +29,9 @@ boundaryField
 
     outlet
     {
-        type            fixedValue;
-        value           $internalField;
+        type            uniformFixedValue;
+        value           uniform $pressure;
+        uniformValue    $pressure;
     }
 
     "terrain_.*"
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allclean b/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allclean
index cfc95cf865..2e2bcf8132 100755
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allclean
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allclean
@@ -19,4 +19,7 @@ rm -rf constant/polyMesh/sets
 #rm -rf constant/refinementHistory
 #rm -rf constant/surfaceIndex
 
+# Reset decomposeParDict
+cp system/decomposeParDict-nonPar system/decomposeParDict
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allrun b/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allrun
index 7cd2a91b26..c69808608c 100755
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allrun
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allrun
@@ -4,10 +4,29 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+compileApplication windSimpleFoam
+
 runApplication blockMesh
-runApplication snappyHexMesh -overwrite
-runApplication setSet -batch makeZones
-runApplication setsToZones -noFlipMap
-runApplication windSimpleFoam
+cp system/decomposeParDict-nonPar system/decomposeParDict
+runApplication decomposePar
+
+#runApplication snappyHexMesh -overwrite
+#runApplication setSet -batch makeZones
+#runApplication setsToZones -noFlipMap
+#runApplication windSimpleFoam
+
+cp system/decomposeParDict-par system/decomposeParDict
+runParallel snappyHexMesh 2 -overwrite
+
+# Add wildcard entries for meshes patches since not preserved
+# by decomposePar. Notice -literalRE option to add wildcard itself
+# without evaluation.
+runParallel changeDictionary 2 -literalRE
+
+runParallel setSet 2 -batch makeZones
+runParallel windSimpleFoam 2
+
+runApplication reconstructParMesh -constant
+runApplication reconstructPar
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/makeZones b/tutorials/incompressible/simpleFoam/windTurbineTerrain/makeZones
index dac135f004..e1f6bbc4c9 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/makeZones
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/makeZones
@@ -1,2 +1,4 @@
 cellSet actuationDisk1 new boxToCell (581850.5 4785805 1061) (581850.8 4785815 1071)
-cellSet actuationDisk2 new boxToCell (581754 4785658 1065) (581754.4 4785668 1075)
\ No newline at end of file
+cellZoneSet actuationDisk1 new setToCellZone actuationDisk1
+cellSet actuationDisk2 new boxToCell (581754 4785658 1065) (581754.4 4785668 1075)
+cellZoneSet actuationDisk2 new setToCellZone actuationDisk2
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/changeDictionaryDict b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/changeDictionaryDict
new file mode 100644
index 0000000000..09a5e24c6a
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/changeDictionaryDict
@@ -0,0 +1,201 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                     |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      changeDictionaryDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Use absolute path to make sure it also works in parallel
+#include        "$FOAM_CASE/0/include/initialConditions"
+
+dictionaryReplacement
+{
+
+    // Specify 
+    // - all fvPatchFields with potential non-uniform values
+    // - all fvPatchFields originating from meshing
+    // - all fvPatchFields originating from mesh-redistribution
+
+    p
+    {
+        boundaryField
+        {
+            outlet
+            {
+                type            uniformFixedValue;
+                value           $pressure;
+                uniformValue    $pressure;
+            }
+            inlet
+            {
+                type            zeroGradient;
+            }
+            "terrain_.*"
+            {
+                type            zeroGradient;
+            }
+            ground
+            {
+                type            zeroGradient;
+            }
+            #include "$FOAM_CASE/0/include/sideAndTopPatches"
+            "procBoundary.*"
+            {
+                type            processor;
+            }
+        }
+    }
+
+    k
+    {
+        boundaryField
+        {
+            outlet
+            {
+                type            inletOutlet;
+                inletValue      uniform 0.0;
+                value           uniform $turbulentKE;
+            }
+            inlet
+            {
+                type            uniformFixedValue;
+                uniformValue    $turbulentKE;
+            }
+            "terrain_.*"
+            {
+                type            kqRWallFunction;
+                value           uniform 0.0;
+            }
+            ground
+            {
+                type            zeroGradient;
+            }
+            #include "$FOAM_CASE/0/include/sideAndTopPatches"
+            "procBoundary.*"
+            {
+                type            processor;
+            }
+        }
+    }
+
+    U
+    {
+        boundaryField
+        {
+            outlet
+            {
+                type            inletOutlet;
+                inletValue      uniform (0 0 0);
+                value           uniform $flowVelocity;
+            }
+            inlet
+            {
+                type            atmBoundaryLayerInletVelocity;
+                Uref            10.0;
+                Href            20;
+                n               (1 0 0);
+                z               (0 0 1);
+                z0              0.1;
+                zGround         935.0;
+                value           uniform $flowVelocity;
+            }
+            "terrain_.*"
+            {
+                type            uniformFixedValue;
+                uniformValue    $flowVelocity;
+            }
+            ground
+            {
+                type            uniformFixedValue;
+                uniformValue    $flowVelocity;
+            }
+            #include "$FOAM_CASE/0/include/sideAndTopPatches"
+            "procBoundary.*"
+            {
+                type            processor;
+            }
+        }
+    }
+
+    nut
+    {
+        boundaryField
+        {
+            outlet
+            {
+                type            calculated;
+                value           uniform 0;
+            }
+            inlet
+            {
+                type            calculated;
+                value           uniform 0;
+            }
+            "terrain_.*"
+            {
+                type            nutkRoughWallFunction;
+                Ks              uniform 0.2; //Ks = 20 Z0
+                Cs              uniform 0.5;
+                value           uniform 0.0;
+            }
+            ground
+            {
+                type            calculated;
+                value           uniform 0;
+            }
+            #include "$FOAM_CASE/0/include/sideAndTopPatches"
+            "procBoundary.*"
+            {
+                type            processor;
+            }
+        }
+    }
+
+    epsilon
+    {
+        boundaryField
+        {
+            outlet
+            {
+                type            zeroGradient;
+            }
+            inlet
+            {
+                type            atmBoundaryLayerInletEpsilon;
+                Ustar           0.82;
+                z               (0 0 1);
+                z0              0.1;
+                value           uniform $turbulentEpsilon;
+                zGround         935.0;
+            }
+            "terrain_.*"
+            {
+                type            epsilonWallFunction;
+                Cmu             0.09;
+                kappa           0.4;
+                E               9.8;
+                value           uniform $turbulentEpsilon;
+            }
+            ground
+            {
+                type            zeroGradient;
+            }
+            #include "$FOAM_CASE/0/include/sideAndTopPatches"
+            "procBoundary.*"
+            {
+                type            processor;
+            }
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict
index ede2ec0462..f45f2839e1 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict
@@ -15,35 +15,15 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-numberOfSubdomains 1;
+numberOfSubdomains 2;
 
 method          hierarchical;
-// method          metis;
-// method          ptscotch;
-
-simpleCoeffs
-{
-    n               (4 1 1);
-    delta           0.001;
-}
 
 hierarchicalCoeffs
 {
-    n               (1 1 1);
-    delta           0.001;
-    order           xyz;
+    n           (2 1 1);
+    delta       0.001;
+    order       xyz;
 }
 
-manualCoeffs
-{
-    dataFile        "cellDecomposition";
-}
-
-metisCoeffs
-{
-    //n                   (5 1 1);
-    //cellWeightsFile     "constant/cellWeightsFile";
-}
-
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-nonPar b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-nonPar
new file mode 100644
index 0000000000..f45f2839e1
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-nonPar
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 2;
+
+method          hierarchical;
+
+hierarchicalCoeffs
+{
+    n           (2 1 1);
+    delta       0.001;
+    order       xyz;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-par b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-par
new file mode 100644
index 0000000000..cd9a4dc250
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-par
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 2;
+
+method          ptscotch;
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSchemes b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSchemes
index 30ee3b82f4..2e7c10da7b 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
 {
     default             none;
     div(phi,U)          Gauss upwind grad(U);
-    div((nuEff*dev(grad(U).T())))   Gauss linear;
+    div((nuEff*dev(T(grad(U)))))    Gauss linear;
     div(phi,epsilon)    Gauss upwind;
     div(phi,k)          Gauss upwind;
 }
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSolution b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSolution
index 5bcf8d9898..ec738df41a 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSolution
@@ -18,49 +18,49 @@ solvers
 {
     p
     {
-        solver      smoothSolver;
-        smoother    GaussSeidel;
-        tolerance   1e-6;
-        relTol      0.01;
-        maxIter     300;
-    };
+        solver           GAMG;
+        tolerance        1e-7;
+        relTol           0.1;
+        smoother         GaussSeidel;
+        nPreSweeps       0;
+        nPostSweeps      2;
+        cacheAgglomeration on;
+        agglomerator     faceAreaPair;
+        nCellsInCoarsestLevel 10;
+        mergeLevels      1;
+    }
 
     U
     {
-        solver      smoothSolver;
-        smoother    GaussSeidel;
-        tolerance   1e-6;
-        relTol      0.01;
-    };
+        solver           smoothSolver;
+        smoother         GaussSeidel;
+        tolerance        1e-8;
+        relTol           0.1;
+        nSweeps          1;
+    }
 
     k
     {
-        solver      smoothSolver;
-        smoother    GaussSeidel;
-        tolerance   1e-6;
-        relTol      0.01;
-    };
+        solver           smoothSolver;
+        smoother         GaussSeidel;
+        tolerance        1e-8;
+        relTol           0.1;
+        nSweeps          1;
+    }
 
     epsilon
     {
-        solver      smoothSolver;
-        smoother    GaussSeidel;
-        tolerance   1e-6;
-        relTol      0.01;
-    };
-
-    omega
-    {
-        solver      smoothSolver;
-        smoother    GaussSeidel;
-        tolerance   1e-6;
-        relTol      0.1;
-    };
+        solver           smoothSolver;
+        smoother         GaussSeidel;
+        tolerance        1e-8;
+        relTol           0.1;
+        nSweeps          1;
+    }
 }
 
 SIMPLE
 {
-    nNonOrthogonalCorrectors     1;
+    nNonOrthogonalCorrectors     0;
     convergence                  1e-3;
 }
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes
index df3462c54d..0441f1b20a 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phirb,alpha) Gauss interfaceCompression 1;
     div(phi,p_rgh)  Gauss upwind;
     div(phi,k)      Gauss vanLeer;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes
index df3462c54d..0441f1b20a 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phirb,alpha) Gauss interfaceCompression 1;
     div(phi,p_rgh)  Gauss upwind;
     div(phi,k)      Gauss vanLeer;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
index 8159d1c62c..ccfffe51ae 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(B)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
index c6205f8cb6..ef617145e1 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes